Update to handle zsh and vagrant