fixs
Merge branch 'master' of github.com:zhangyangjing/vimfiles