shopt -s direxpand
Merge branch 'master' of github.com:n8henrie/.dotfiles

Conflicts:
	vim/.netrwhist