Fixed dependencies. Rewrote some so I could break ties with ediff-trees
[git-p4: depot-paths = "//usr/ryand/Bin/elisp/": change = 9040]