Merge pull request #1 from Arrogance/develop

More Plugins and some cleanup
Merge branch 'master' of github.com:Arrogance/nerdobot into develop