Close keybase/keybase-issues#194
Merge branch 'master' of github.com:keybase/kbpgp

Conflicts:
	CHANGELOG.md