vim

Update vimrc

Merge branch 'master' of https://github.com/fserra/vim

init

Initial commit