Small improvements

* Update result dictionary keys
* Unify keychain item deletion code
* Don't delete keychain items when saving; update if possible
See https://github.com/soffes/sskeychain/pull/43#issuecomment-22417035