add new Java conflict resolver
complete explanation
break up into sections
start reorganizing index doc
rough drafts for ruby and pythong
ruby still broken
index cleanup
more language cleanup
Fix Precise Ubuntu install script
java tutorial language cleanup
start fixing python doc
finish python rough draft
changes in light of @seancribbs input
revamp read/modify/write section
swap out section on writes in all 3 docs
done
Merge pull request #1365 from basho/lp/advanced-sibling-resolution-example

WIP: Add new conflict resolution examples
add section for riak.conf
Removed link to one paper, since there is already a link to an extension of that paper; added a link to the published DVV paper.
added missing get operation to erlang example