Merge all the things

This is a merge of all of these patches:

* https://github.com/mozilla/browserid-local-verify/pull/10
* https://github.com/mozilla/browserid-local-verify/pull/11
* https://github.com/mozilla/browserid-local-verify/pull/12
* https://github.com/mozilla/browserid-local-verify/pull/13
* https://github.com/mozilla/browserid-local-verify/pull/14
* https://github.com/mozilla/browserid-local-verify/pull/15
* https://github.com/mozilla/browserid-local-verify/pull/20
* https://github.com/mozilla/browserid-local-verify/pull/22
* https://github.com/mozilla/browserid-local-verify/pull/23