Merge branch 'master' of github.com:jyd519/vimconf
Merge branch 'master' of https://github.com/jyd519/vimconf