Cleaning up the code a little
Merge branch 'master' of https://github.com/hrna/phpBot