Merge branch 'dev' of github:colinsf/skybot-plugins into dev
Merge branch 'dev'
Merge branch 'master' of github:colinsf/skybot-plugins into dev
Fixed stuff.