update
Merge branch 'master' of github.com:azure-satellite/vim

Conflicts:
	.vimrc