Feature/consistent riak2.0

:octocat: