Minor re-writing of history and moving from master to main for default branch

[tacaswell]

We also noted on the call that

git rebase -i main

will give the use 3 extra commits + their commits as another option to manage the re-base.