yeah yeah
Merge branch 'master' of https://github.com/evanwalsh/ebot

Conflicts:
	hubot-scripts.json