Upgrade rails due to CVE-2014-7818

https://groups.google.com/forum/#!topic/rubyonrails-security/dCp7duBiQgo
Merge pull request #255 from alphagov/upgrade-rails

Upgrade rails due to CVE-2014-7818