test
Merge branch 'master' of https://github.com/cyokvip/vim

Conflicts:
	_vimrc
	bundles.vim
添加vundle