Merge pull request #369 from erickt/unknown-keytypes

Fix unknown keyid and signature schemes