Upgrading to rails 3.1.10
merge in heroku production