Merge all the things

This is the same as https://github.com/mozilla/browserid-local-verify/pull/25 to hopefully work-around the bogus test failures seen by Travis.