add auto-join options
:
add auto-join options fix
add auto-join options fix
fix auto-join
fix auto-join
change tab to spaces
change tab to spaces
change tab to spaces
change tab to spaces
change tab to spaces
change tab to spaces
change autojoin
fix spaces - what the
fix spaces - what the
add else
fix bot
update to head clean up
adding hubot-hipchat.coffee back
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/hipchat.coffee
Merge remote-tracking branch 'upstream/master'