Upgrade rails

Generally a good thing to track.
Merge pull request #188 from alphagov/feature/rails-upgrade

Upgrade rails