- upgraded stuff to rails 4
- resolved parse errors caused by rails 3 syntax