extracted the extractSiblings part from the resolveConflict method
Added fetchWithMulti method to the Riak Bucket to optionally fetch siblings without resolving
Merge branch 'master' of https://github.com/didierliauw/riak-scala-client into publish-local