Refactor Keychain Properties

Add clientID and clientSecret so these will now save to the
keychain. Moved keychain category into its own file to clean
up CKIClient.