modified .gvimrc
Merge branch 'develop' modified