Cleaning vundles.vim

Conflicts:
	vim/vundles.vim
Merge pull request #324 from lfilho/cleaning-vundle

Cleaning vundles.vim
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Cleaning vundles.vim