Merging latest Keyring changes from Beau into our fork of Keyring

I think it's a good idea to keep using our fork though since the nature of some of the changes that might happen in the future could break things for us.  In fact I believe this one will break one aspect of our