update keychain for keys
merge master