refactors public key logic to be more intuitive
Merge pull request #246 from bshaffer/refactor-crypto-tokens

refactors public key logic to be more intuitive