Fail if no channel
Fix not-enough-arguments error
Merge branch 'master' of https://github.com/diracdeltas/heartbleat into diracdeltas-master

Conflicts:
	lib/main.js