Nice work, pushed. The smime map looks like maybe it doesn't belong, though.
Attachment: pgpSXI5kaJCgY.pgp Description: PGP signature