Change from Vundle to NeoBundle

Conflicts:
	conf/bundles.vim
	setup.sh