[fix] update scripts, hubot
Merge branch 'upgrade'

Conflicts:
	hubot-scripts.json
	package.json
	scripts/google-images.coffee
	scripts/help.coffee
	scripts/pugme.coffee
	scripts/roles.coffee
	scripts/translate.coffee
[fix] failed merge
[fix] add cherrio dependency