Derive key_id instead of adding as an arbitrary string

Changelog for v0.2.22:

Commits
4ddc741 Derive key_id instead of adding as an arbitrary string by @alexellis

Changes: v0.2.21...v0.2.22

Generated by Derek