Repo has a master and main branch

The master branch is still the default, but we should consolidate these branches.