Merge pull request #6 from jwinterm/master

merge

price.py

@@ -675,7 +675,7 @@ def commodity(bot, trigger):
     commodity_key = 'B1ZnykTmG6_A1vkwzt9u'
     input_com = trigger.group(2).upper()
     if input_com == ('AU' or 'GOLD' or 'XAU'):
-        commodity = 'AU_EGL'
+        commodity = 'AU_EIB'
         unit = 'oz'
     elif input_com == ('AG' or 'SILVER' or 'XAG'):
         commodity = 'AG_USD'

trifling.py

@@ -597,7 +597,8 @@ def whaleornot(bot, trigger):
 
     if not trigger.group(2):
         bot.say("Gotta have skin in the game to be a big fish! Add some XMR after the command to see what level the player is at!")
-    else
+    else:
+        try:
             xmr_size = int(trigger.group(2))
             if xmr_size < 0.1:
                 fish_string = "plankton"  
@@ -643,5 +644,7 @@ def whaleornot(bot, trigger):
                 fish_string = "Leviathan"
             elif xmr_size >= 200000:
                 fish_string = "Cthulu"
-
             bot.say("{0} level.".format(fish_string))
+        except:
+            bot.say("Try a base ten representation of a number")
+