Repo: Rebase back to Omni

Signed-off-by: Nicholas <amperific@gmail.com>