Support Rails 4
Merge pull request #190 from jeremy/rails4

Support Rails 4