Merge branch '3.0' of github.com:spf13/spf13-vim into 3.0
Merge branch '3.0' of github.com:zhangyuheng/vimrc into 3.0
Merge branch '3.0' of github.com:zhangyuheng/vimrc into 3.0