Upgrade rails again
Merge pull request #242 from alphagov/upgrade-rails

Upgrade rails again