tweak timing
Merge branch 'master' of https://github.com/chenosaurus/snackbot
Merge branch 'master' of https://github.com/chenosaurus/snackbot
Merge branch 'master' of https://github.com/chenosaurus/snackbot
Merge remote-tracking branch 'origin/master'

Conflicts:
	bot.js
fix port
Merge branch 'master' of https://github.com/chenosaurus/snackbot