Two light commits for email

Better specs and better SiteSettings
@eviltrout Can you help me figure out how to trigger this test?