Attempting to work around heroku asset precompilation error.
Revert "Attempting to work around heroku asset precompilation error." because it didn't work.

This reverts commit c14917ee723ef0a0db159dd457050c78bd4349b5.
Upgraded to rails 4
Merge branch 'upgrade_to_rails4'