adding hipchat notification QA-48
incrementing version QA-48
bumping version QA-48
resolving conflicts QA-48
bumping again, I hate PRs sometimes QA-48
Merge pull request #15 from sightmachine/task/QA-48

adding hipchat notification QA-48