update vimdc
Merge branch 'master' of github.com:zhouyan/user_vim