changed on stuarts-mbp
Merge branch 'master' of github.com:kd5pbo/dotfiles

Conflicts:
	.vim/.netrwhist