Fixing setup file and adding zsh to the mix