:8ball:
Merge branch 'master' into 8ball

Conflicts:
	hubot-scripts.json
Merge pull request #55 from detroit-labs/8ball

:8ball: