Upgrade/rails 3.1