Merge branch 'master' of github.com:curipha/dotfiles
Set keywordprg in vim files
Add diff algorithm