Removed .netrwhist
Merge branch 'master' of github.com:okpedersen/dotfiles

Conflicts:
	.vim/.netrwhist