added hipchat app to default.yml

* thought this would be something useful to install for both designers,
dev, and some EIRs
fixed merge conflicts
Merge branch 'add_hipchat_app'

* add_hipchat_app:
  added hipchat app to default.yml