default to vimdiff for git
Merge branch 'master' of https://github.com/gsar/cfg