Ctrlp
Merge branch 'master' of github.com:JustinTulloss/config_files
mods
Merge branch 'master' of github.com:JustinTulloss/config_files

Conflicts:
	.gitmodules
	vimrc
Remove old submodules