commas
Merge branch 'master' of https://github.com/smoochy/bugbotjs

Conflicts:
	bugbot.js