environment updates
Merge branch 'master' of github.com:monai/dotfiles

Conflicts:
	zsh/integration.zsh