Fixing up some issues with our keyring
Merge branch 'master' of http://github.com/ArchBSD/abs