netrw added
Merge branch 'master' of https://github.com/sohlas/vim

Conflicts:
	.netrwhist