Merge PR #81 with master

https://github.com/mozilla/minion-backend/pull/82