fixed major gem conflicts and new rails syntax for updating rails 3 to 4