Big rework.
Merge branch 'master' of https://github.com/xClueless/IRCBot