Merge branch 'break-up-notifiers'

Conflicts:
	app/models/notifier.rb
Use the `hipchat?` method instead of the token
Fix the deployment_payload object
Merge branch 'break-up-notifiers'