CentOS
Merge branch 'master' of https://github.com/lxw0109/vim

Conflicts:
	.netrwhist
	snippets/html.snippets
	snippets/snippet.snippets