ediff as default git difftool
Merge branch 'master' of github.com:tomasherman/dotfiles