vim/vim/.netrwhist removed from source control updates
Merge branch 'master' of github.com:Loki-Astari/UnixConfig

Conflicts:
	vim/vim/.netrwhist