Fix conditional quelpa and switch back to cask.  Bring back removed Cask packages.