updating vim things
[submodule "vim/bundle/YouCompleteMe"]
	url = git://github.com/Valloric/YouCompleteMe
[submodule "vim/bundle/nerdtree"]
	url = git://github.com/scrooloose/nerdtree.git
Changes from Sulaco
Fixed merge conflict