Vimdiff as default difftool.
Merge branch 'master' of https://github.com/ryanmjacobs/ryans_dotfiles