Migrate to Omnibus 3

Whole bunch of work to move to new Omnibus. Still not perfect, but getting closer.