add git clone https://github.com/gmarik/vundle.git ~/.vim/bundle/vundle
Merge branch 'master' of https://github.com/yinzl/vimrc

Conflicts:
	.vimrc