Upgrade to Locksmith for keychain. Make Travis tests pass.