Install zsh when on OSX, bash on Linux.  Add new mac machine name