restart, net credit
Merge branch 'master' of https://github.com/jmmastey/cnubot

(plus fixes because fuckit)

Conflicts:
	scripts/cnuapp.coffee