updated with hipchat
updated manifests
Merge branch 'master' into customize
Merge pull request #2 from allenarthurgay/customize

Customize