Upgraded to Rails 4
Merge pull request #1 from danstorms/rails4

Upgraded to Rails 4