stop tracking a history file
Merge branch 'master' of https://github.com/phreeza/dotfiles

Conflicts:
	.vim/.netrwhist