initial changes
modify vclocks language
Merge branch 'master' into bugs/lp/conflict-resolution-changes
wording changes in first P
polish LWW vs timestamp sections
add section on allow_mult and bucket types
final changes
Merge pull request #1216 from basho/bugs/lp/conflict-resolution-changes

WIP: Conflict Resolution changes