Bump to Rails 4.1.7 and update bundle

* Removed a hack that was waiting for a new version of Mail
* FactoryGirl changed `ignore` to `transient`