Testing on rails4
Merge pull request #21 from projecthydra/rails4

Testing on rails4