Changes to be committed:
	modified:   .gitmodules
	new file:   vimfiles/bundle/ctrlp.vim
	new file:   vimfiles/bundle/omnisharp-vim
	new file:   vimfiles/bundle/vim-dispatch
Merge branch 'master' of github.com:memborg/Vim

Conflicts:
	.gitmodules