mailer: Pick content_ids that Mail_Mime will enjoy
oops: Fix bad merge
oops: Fix shipping Staff group disabled
Merge pull request #662 from greezybacon/issue/oops

Fix several small issues

Reviewed-By: Peter Rotich <peter@osticket.com>