Add keyrings
Fix loading of keyrings
Prevent non-key items from being placed on a keyring
Merge branch 'keyring'