Added clarification notes
Improved wording of notes
Merge pull request #986 from dkillick/merge_docs_update

DOC: Clarification notes for (apparently) merge-related tools