Fix whitespace
Add util.unique array fn
Combine implementations of diff and merge

* Use one set of rules for deciding about file changes