vim
Merge branch 'master' of github.com:pilu/.dotfiles
config updated