Reconcile local emacs with home's

modified:   .emacs-shared
modified:   .emacs.d/init.el
modified:   cmd/ediff
modified:   cmd/emerge