Tweaked usage of keychain in osx token cache.

Simplified implementations.
Fixed removal of tokens from cache, it now removes them correctly from keychain.
Merge pull request #1245 from christav/mac-logout-fix

Mac logout fix