Add some code that seems plausible for getting emacsclient to work with ediff.
Some functions to let me tell emacsclient to exit with non-zero status.
Various mergetool and emacs server related changes all to improve git workflow.
Merge branch 'master' of github.com:pnkfelix/DotFiles