x
updates
Merge branch 'master' of github.com:egradman/dotvim

Conflicts:
	.netrwhist
remove netrw