Rails4 new

Update TODOs that are related to rails 4.
Fix errors caused by the upgrade.