Riak client 2.x

Updated pull request for an update to riak 2.0