update .vimrc
Merge branch 'update_vimrc' into develop
Merge branch 'release-0.1'