Revert 556dc37..7c7f631

This rolls back to commit 556dc372a4d9f76681cc838ed2ec4f8fa1bbe3cd.
Rails 4 gem changes for heroku compatibility