Copy some changes from work boxen

Including local_zshenv hack.