Merge remote-tracking branch 'origin/develop' into feature/collapsed_configs

assets/locCommands.config

@@ -90,7 +90,7 @@ buildHelp=
 dbflush=
 shutdown=
 boop=
-tony, stark, dontfeelgood, dontfeelsogood=
+tony, stark, dontfeelgood, dontfeelsogood=tony, stark, dontfeelgood, dontfeelsogood, snap
 role=
 raffleend=
 ping=
@@ -99,7 +99,8 @@ roll=
 blur=
 choose=
 rpstart=
-guildrolenotallowed=
+guildrolenotallowed=guildrolenotallowed, rolelistremove
+derp=
 perish, thenperish=
 teey=
 searchcharacter=
@@ -110,8 +111,10 @@ eightball, 8ball=
 vote=
 map=
 info, about=
+e621=
 showpoll=
 rpg=
+defaultdance=
 tweet=
 charactercreate=
 help=