Merge branch 'master' into scraper_functions

Merged master,resolved conflicts

functions.py

@@ -6,6 +6,8 @@ def processmsg(msg, rcpt):
         return msg.replace("youtube.com", "iv.datura.network")
     elif msg.startswith("!wiki"):
         return sf.query_external_website("https://en.wikipedia.org/wiki/", msg.split(" ")[1])
+    elif "good bot" in msg:
+        return "^_^"
 
 def command(msg, rcpt):
     if msg.startswith("!help"):