Rails4

All tests run, does not use test server so will need to have riak running first.
This adds support for rails 4.0+
Should we remove the commented-out code?