Upgrade to Rails 3.1