Cleaned up imports, changed PrivateKey to KeyPair. Committing a lot
because I don't know when Jaffe is going to start playing with this
again.