Rails 4 updates
Merge pull request #24 from bbuchalter/rails4

Rails 4 updates