Merge pull request #1 from jwinterm/master

pull

trifling.py

@@ -104,6 +104,10 @@ def fib(bot, trigger):
 def flip(bot, trigger):
     bot.say(u'(╯°□°）╯︵ ┻━┻'.encode('utf8'))
 
+@sopel.module.commands('fuck')
+def fuck(bot, trigger):
+    bot.say("Fuck your {} if you want fuck!".format(trigger.group(2)))
+
 fuckyouoptions = [
 "http://imgur.com/Kt8os8v",
 "https://pbs.twimg.com/profile_images/502111486915788801/DtB5ruDz_400x400.jpeg",
@@ -157,6 +161,10 @@ def joshua(bot, trigger):
 def jwinterm(bot, trigger):
     bot.say(u'j_winter_m')
 
+@sopel.module.commands('kid', 'rehrar')
+def kid(bot, trigger):
+    bot.say(u'What up kid?')
+
 @sopel.module.commands('lenny')
 def lenny(bot, trigger):
     bot.say(u'( ͡° ͜ʖ ͡°)'.encode('utf8'))
@@ -362,20 +370,20 @@ def asp(bot, trigger):
 
     try:
         r=requests.get(polourl)
-            j=r.json()
-        except:
-            bot.say("Error connecting to Poloniex")
+        j=r.json()
+    except:
+        bot.say("Error connecting to Poloniex")
             
-        label_dash="BTC_DASH"
-        label_decred="BTC_DCR"
-        label_factom="BTC_FCT"
-        label_golem="BTC_GNT"
-        label_maidsafecoin="BTC_MAID"
-        label_augur="BTC_REP"
-        label_stellar="BTC_STR"
-        label_nem="BTC_XEM"
-        label_ripple="BTC_XRP"
-        label_zcash="BTC_ZEC"
+    label_dash="BTC_DASH"
+    label_decred="BTC_DCR"
+    label_factom="BTC_FCT"
+    label_golem="BTC_GNT"
+    label_maidsafecoin="BTC_MAID"
+    label_augur="BTC_REP"
+    label_stellar="BTC_STR"
+    label_nem="BTC_XEM"
+    label_ripple="BTC_XRP"
+    label_zcash="BTC_ZEC"
 
     # Bitstamp
     try: