Merging back in my internbot-new code (for when the move was made to hipchat)