Merge files be gone!
Campfire => Hipchat
Merge pull request #239 from vipulnsward/hipchat_fix

Campfire => Hipchat
Merge branch 'master' into hh-update-user-when-renamed