Merge branch 'master' of github.com:chrys87/fenrir

setup.py

@@ -18,7 +18,7 @@ setup(
     author_email="chrys87@web.de",
 
     # Packages
-    packages=find_packages('fenrir'),
+    packages=find_packages('src/fenrir'),
     package_dir={'': 'src/fenrir'},
     scripts=['src/fenrir/fenrir'],
     #entry_points = {

src/fenrir/core/punctuationManager.py

@@ -59,7 +59,14 @@ class punctuationManager():
           '=':'equals',
           },
         'customDict':{
+          '>:)':'evil smiley',
+          '>:-)':'evil smiley',
+          '>:)}':'evil beerded smiley',
+          '>:-)}':'evil beerded smiley',
           ':)':'smiley',
+          ':-)':'smiley',
+          ':)}':'beerded smiley',
+          ':-)}':'beerded smiley',
           ';)':'winking face',
           'XD':'loool',
           ':@':'angry face',