brew & cask: add Fish, fix mistakes from last commit