modify vimrc
Merge branch 'work'