bundle
Merge branch 'master' of github.com:zhuangya/.vim

Conflicts:
	vimrc