Update Gemfile to use latest 3.1.x version of Rails and run 'bundle update'
Merge branch 'master' into auth
Change e-mail address for 'admin' user in test fixture, to avoid conflicting with one created in other tests