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

Conflicts:
	_vimrc
	bundle/vundle
	bundles.vim