Update Vundle HEAD
Better coloring support based on distro
Merge branch 'ubuntu_fixes'

Conflicts:
	vimrc