Load .zshenv if $UNAME is not set in .zshrc
Merge branch 'master' of https://github.com/geoffstokes/dotfiles

Conflicts:
	platform/all/home/zshrc.symlink