Updating zshrc for mac

Conflicts:
	zshrc