Use $SHELL instead of forcing use of zsh
Add update-environment to fix vim color issues in tmux