Merge branch 'development' of https://github.com/dustinpianalto/Geeksbot into development

geeksbot.py

@@ -57,7 +57,7 @@ class Geeksbot(commands.Bot):
         self.infected = {}
         self.TOKEN = self.bot_secrets['token']
         del self.bot_secrets['token']
-        self.db_con = self.connect_db(self)
+        self.db_con = self.connect_db()
         del self.bot_secrets['db_con']
         self.default_prefix = 'g~'
         self.voice_chans = {}