Change kpreid's email address.
Merge pull request #84 from kpreid/patch-1

Change kpreid's email address.
Merge pull request #85 from leif/isolate-keygen-test

Isolate test_keygen in its own base directory. This also causes KeyGeneratorService to create its base directory if it does not exist.
Merge branch 'master' into ticket68