Moving to activerecord 4.0