fixes
Merge branch 'master' of github.com:yyolk/glitchby

Conflicts:
	.gitignore
	Procfile
	hubot-scripts.json
	package.json