Fix all models to accommodate the new rails 4 set up