Cleanup and fix keychain related code.
Merge remote-tracking branch 'instructure/CanvasKit/master'
Merge pull request #27 from jarsen/master

Cleanup and fix keychain related code.