emacs: add vc-ediff binding, winner-undo on ediff quit, horiz split