strong parameters and other changes to make merit work on rails 4
Allow both Rails ~> 3.2 and ~> 4.0.
Merge pull request #69 from tute/rails4

Rails 3.2 & Rails 4 compliance