Set vimdiff as default merge tool for git
Merge branch 'master' of github.com:jcelliott/dotfiles