Use omnibus install

Refactor to use the new supermarket omnibus installer.