Address keybase/keybase-issues#689

Fix indexing of `gpg -K`
Merge branch 'master' of github.com:keybase/gpg-wrapper

Conflicts:
	CHANGELOG.md