chore: merge remaining main edits into v3.3.0#189

sbillinge merged 14 commits into

diffpy:v3.3.0diffpy/diffpy.srfit:v3.3.0from

cadenmyers13:sync-w-main-v2cadenmyers13/diffpy.srfit:sync-w-main-v2Copy head branch name to clipboard