Upgrades
Merge branch 'master' of github.com:uniphil/dennis

Conflicts:
	hubot-scripts.json
	package.json