more work on Kb's keymanager
Merge branch 'master' of github.com:keybase/kbpgp

Conflicts:
	CHANGELOG.md