Merge pull request #11 from grosser/rails4

Run tests with Rails 4 and Ruby 2