environment changes
Merge remote-tracking branch 'origin/master'. Merged zshrc from macbook and work imac.

Conflicts:
	zshrc