changed adapter to hipchat
Merge branch 'master' of github.com:mosaz/hubot

Conflicts:
	Procfile