upgraded to rails 4

https://www.pivotaltracker.com/story/show/67572706
[Finishes #67572706]
Merge pull request #2 from joshclick/upgrade_rails_4

upgraded to rails 4