add html vi config
update
Merge branch 'master' of https://github.com/zixiao/TrueColor

Conflicts:
	packages/vim/.netrwhist