Make OSX Keychain nag less

On OSX, all credentials are now inserted into a single map, JSON-serialized and written under a single key in Keychain.
Upgrade path from 0.7 is updated as well.
General cross-platform code path should be unchanged.