Merge branch 'develop' of github.com:ClouDev/CloudBot into develop

plugins/factoids.py

@@ -1,7 +1,4 @@
-"""
-remember.py: written by Scaevolus 20101
-"""
-
+# Written by Scaevolus 2010
 from util import hook
 import string
 import re

plugins/feelings.py

@@ -8,16 +8,12 @@ insults = []
 flirts = []
 
 with open("plugins/data/insults.txt") as f:
-    for line in f.readlines():
-        if line.startswith("//"):
-            continue
-        insults.append(line.strip())
+    insults = [line.strip() for line in f.readlines()
+        if not line.startswith("//")]
 
 with open("plugins/data/flirts.txt") as f:
-    for line in f.readlines():
-        if line.startswith("//"):
-            continue
-        flirts.append(line.strip())
+    flirts = [line.strip() for line in f.readlines()
+        if not line.startswith("//")]
 
 
 @hook.command