#47. HipChat config moved from XMPP config to external config part
Merge branch 'master' of git://github.com/0xAX/Ybot

Conflicts:
	src/ybot_manager.erl
	ybot.config