ignore .netrwhist
Merge branch 'master' of github.com:zenja/dot-vim

Conflicts:
	.gitignore