Added vim-bundler as submodule.
Resolved conflict.

Merge branch 'master' of github.com:Partyschaum/vim-setup

Conflicts:
	.gitmodules