Clean up conflicts section re: using kdiff3 as GUI merge tool

The text hadn't truly committed to using kdiff3 - now it has :-)
I have successfully test run the merge conflict part of the lesson on Ubuntu, Windows 7, and OS/X with kdiff3 as the merge tool specified explicitly (`hg merge --tool=kdiff3`).

Also included are a couple of tweaks to smooth things out on Windows.