Merge branch 'master' of /home/ro/Desktop/Houdini-asyncio with conflicts.

config.py.sample

@@ -1,55 +0,0 @@
-from houdini import ConflictResolution
-from houdini import Language
-
-database = {
-    'Address': 'localhost',
-    'Username': 'postgres',
-    'Password': 'password',
-    'Name': 'houdini',
-}
-
-redis = {
-    'Address': '127.0.0.1',
-    'Port': 6379
-}
-
-commands = {
-    'Prefix': ['!', '?', '.'],
-    'StringDelimiters': ['"', "'"],
-    'ConflictMode': ConflictResolution.Silent
-}
-
-servers = {
-    'Login': {
-        'Address': '0.0.0.0',
-        'Port': 6112,
-        'World': False,
-        'Plugins': [
-            'Example'
-        ],
-        'Logging': {
-            'General': 'logs/login.log',
-            'Errors': 'logs/login-errors.log',
-            'Level': 'INFO'
-        },
-        'LoginFailureLimit': 5,
-        'LoginFailureTimer': 3600,
-        'KeyTTL': 3000
-    },
-    'Blizzard': {
-        'Id': '100',
-        'Address': '0.0.0.0',
-        'Port': 9875,
-        'Language': Language.En,
-        'World': True,
-        'Capacity': 200,
-        'CacheExpiry': 3600,
-        'Plugins': [
-        ],
-        'Logging': {
-            'General': 'logs/blizzard.log',
-            'Errors': 'logs/blizzard-errors.log',
-            'Level': 'INFO'
-        }
-    }
-}