Add cloud search tab, lose Keybase/Keyserver tabs, re-organize prefs
Restore Yubikey setting, lost in fumble-fingered merge
Change shuffle to rotate, and when merging ImportKeysList entries, if either side is revoked/expired, the merge reflects that
Keys found on multiple servers are now imported from all of them
update for new plural origins on ImportKeyListEntry
Merge pull request #844 from timbray/master

Add cloud search tab, lose Keybase/Keyserver tabs, re-organize prefs