updated path for vim
Merge remote-tracking branch 'origin/master' into my-local-config