Teaching git how to use vimdiff
Merge branch 'master' of github.com:socketwiz/dotfiles