Remove env.zsh
Merge branch 'master' into mac