Switch back to addressable-generated routes, update email_spec to add support for latest RSpec matchers