Thanks for all the great feedback in this review @peterbe. I've created a [new pull request](https://github.com/mozilla/PyHawk/pull/7) with these fixes.