Upgrade to rails3