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