Minor cleanups of same. Investigating still if we want to cull the keychain further, as not to confuse the user - or if it is useful to show system wide x509's - as these are commonly used in enterprise settings.
 E.g. at surfnet/universities tying it to their IEEE802.1X