new edit key: first version to add user ids
Start work on a first-time wizard
Merge branch 'master' of github.com:open-keychain/open-keychain