Adding uniqueness to keystore keychain IDs across app installs
Merge pull request #562 from khawkins/keystore_updates

Keystore updates