Changes to support user control
Merge branch 'master' of https://github.com/Woodhouse-bot/woodhouse-hipchat