Merge pull request #1 from fr0stycl34r/groupbot

Merge the most recent changes from branch 'master' of https://github.com/Tox/toxic
Merge branch 'groupbot' of https://github.com/JFreegman/toxic