Trials branch

There is an issue with testing. The :email sequence in the user factory is causing the feature tests to break. When you run rake spec none of the feature tests get run so it is not noticeable. It's possible that travis uses a different database configuration that prevents the errors a local machine picks up.