gdiff to gd
Merge branch 'master' of https://github.com/stephanebruckert/dotfiles