Keychain item factory pattern
Final updates to consume new keychain API
Merge pull request #820 from khawkins/keychain_update

Keychain update