Re-work git branches

[werebus]

I think the cleanest way to get back to active fork status is this:

• Make PRs for this project against new-main
• Push our now majorly-diverged branch to old-main for archival purposes
• Once new-main is ready, force-push it to main (😬)