Import Ubuntu's global vim settings.

Conflicts:
	vimrc
Fix more of my bad merging