Address ticket 620: tweak some language, radically simplify the last_write_wins section, be explicit about configuration combinations
Merge pull request #621 from basho/issue620

Address ticket 620 (and then some)