Change dependencies to be rails4 compatible
Merge pull request #366 from simonharrer/change-dependencies-to-be-rails4-compatible

Change dependencies to be rails4 compatible