changed .zshrc, added .zshenv.macosx and deleted .macosx_env
merged .linux_env