Merge pull request #337 from pypeit/develop

Merges develop into main (1.17.0 tag prep)

Merge pull request #323 from pypeit/develop

Merges develop into main (tag 1.16.0 prep)

Merge pull request #308 from pypeit/staged

Merge develop into main (1.15.0 tag; take 2)