Upgrade to rails 3