hipchat error hotfix
Merge branch 'deployment' of github.com:Ragnarson/people into deployment
merge