Keys: Refactored to use Pubkey and Privkey and removed Keypair
Merge pull request #573 from braydonf/ref/remove-keypair

Keys: Refactored to use Pubkey and Privkey and removed Keypair