removed PluggableDiffMergeMorph (last commit forgot untracked files). Added Monticello to baseline.
Merge remote-tracking branch 'origin/master'