[review] Hip-cat split part 1: hipchatless noncontroversial patches

Requesting review before sending this to wilmer.

These are what I believe the easiest part to merge of the whole branch, most of them not really relevant to hipchat at all, but that happened during that cleanup.

------

For those who read this (I KNOW YOU ARE THERE), please actually review this shit or leave any kind of comment. A "LGTM" would be good, a "fuck off dx i'm too busy to read your shit" is acceptable too.