update vimrc from windows
Merge branch 'master' of github.com:mh29110/dot-vimrc

merge