Updated vim
Merge branch 'Laptop'

Conflicts:
	.vim/.netrwhist
	.vimrc