Replace vundle with NeoBundle
Install NeoBundle into base vim dir
Merge branch 'NeoBundle'

Conflicts:
	vim/vundles.vim