Add message_format option

Conflicts:
	hipchat_room_message