update
update vimrc
Merge branch 'master' of github.com:leehong/my_vim