Use gvimdiff instead of meld
Merge branch 'master' of github.com:joshaw/bin