Two light commits for email

Better specs and better SiteSettings