Integrate with develop branch

Integrate with the latest-and-greatest Riak.