Updated vim
Merge branch 'master' of https://github.com/paulamaddock/vim

Conflicts:
	.vimrc