Some changes... not sure what.
Merge branch 'master' of https://github.com/tlmaloney/dotfiles

Conflicts:
	_vim/.netrwhist