Updated to better follow jslint
Merge branch 'master' of https://github.com/kokarn/KokBot

Conflicts:
	bot.js