Add config to clear keychain
Merge branch 'settings' into step1