little tidying for hipchat
Merge pull request #364 from stuarth/hipchat-cleanup

little tidying for hipchat