return the messages that work with hipchat to slack properly
Merge branch 'master' into break-up-notifiers

Conflicts:
	app/models/notifier.rb