- add ./bin to path for binstubs
- use emacs ediff as git mergetool