remove youCompleteMe
python-mode virmrc
Merge branch 'master' of https://github.com/akatsoulas/dotvim

Conflicts:
	.gitmodules
	bundle/YCM