Agreed. I made it into a 'refactoring' step in 8154d5c.

I'm going to leave `email_spec` only as a mention - it's a nice benefit but we have a lot of material to cover, and it involves a bunch of monkey with the `spec_helper.rb` file which kind of eats up time. Mention it in bcee41b.