Bad syntax
Merge branch 'master' of git://github.com/joshcom/vimconfig

Conflicts:
	.vimrc
Merge branch 'master' of git://github.com/joshcom/vimconfig
Merge branch 'master' of git://github.com/joshcom/vimconfig
Ctrlp configs