Tweaks, improved reddit

plugins/data/kills.json

@@ -1,5 +1,5 @@
 {
-   "templates":[
+    "templates": [
         "rips off {user}'s {limbs} and leaves them to die.",
         "grabs {user}'s head and rips it clean off their body.",
         "grabs a {gun} and riddles {user}'s body with bullets.",
@@ -24,7 +24,7 @@
         "feeds {user} coke and mentos till they violently explode."
     ],
     "parts": {
-      "gun":[
+        "gun": [
             "AK47",
             "machine gun",
             "automatic pistol",

plugins/reddit.py

@@ -1,9 +1,11 @@
-from util import hook, http, text, timesince
 from datetime import datetime
 import re
 import random
 
-reddit_re = (r'.*((www\.)?reddit\.com/r[^ ]+)', re.I)
+from util import hook, http, text, timesince
+
+
+reddit_re = (r'.*(((www\.)?reddit\.com/r|redd\.it)[^ ]+)', re.I)
 
 base_url = "http://reddit.com/r/{}/.json"
 short_url = "http://redd.it/{}"