Fixed the rails 3 to reflect the new RAILS3 upgrade on master