Updated dependencies to work with rails4
Merge pull request #19 from cj/rails4

Updated dependencies to work with rails4