Riak 2.0 support

Builds on #160