Update git configuration
Update vim configuration
Merge branch 'master' of github.com:abeaumet/dotfiles