added netwrhist ignore
Merge branch 'master' of github.com:fergusb/vim
Merge branch 'master' of github.com:fergusb/vim

Conflicts:
	.gitignore