Mac changes

Conflicts:
	.netrwhist
	zshrc