Merge main into v1.6.0 branch

[freemansw1]

I couldn't figure out how to easily do this as part of #462 , so doing it in a separate PR, if that's ok @w-k-jones .

This PR merges the changes that are now in main (and from RC_V1.5.x) into RC_v1.6.0.

• [ ] Have you followed our guidelines in CONTRIBUTING.md?
• [ ] Have you self-reviewed your code and corrected any misspellings?
• [ ] Have you written documentation that is easy to understand?
• [ ] Have you written descriptive commit messages?
• [ ] Have you added NumPy docstrings for newly added functions?
• [ ] Have you formatted your code using black?
• [ ] If you have introduced a new functionality, have you added adequate unit tests?
• [ ] Have all tests passed in your local clone?
• [ ] If you have introduced a new functionality, have you added an example notebook?
• [ ] Have you kept your pull request small and limited so that it is easy to review?
• [ ] Have the newest changes from this branch been merged?

[github-actions[bot]]

Linting results by Pylint:

Your code has been rated at 8.72/10 (previous run: 8.72/10, +0.00) _{The linting score is an indicator that reflects how well your code version follows Pylint’s coding standards and quality metrics with respect to the RC_v1.6.0 branch. A decrease usually indicates your new code does not fully meet style guidelines or has potential errors.}

[codecov[bot]]

Codecov Report

Attention: Patch coverage is 90.47619% with 14 lines in your changes missing coverage. Please review.

Project coverage is 62.00%. Comparing base (0ebee82) to head (5a9190e).

Files with missing lines	Patch %	Lines
tobac/feature_detection.py	76.59%	11 Missing :warning:
tobac/utils/bulk_statistics.py	78.57%	3 Missing :warning:

Additional details and impacted files

```diff @@ Coverage Diff @@ ## RC_v1.6.0 #463 +/- ## ============================================= - Coverage 62.27% 62.00% -0.28% ============================================= Files 23 23 Lines 3690 3687 -3 ============================================= - Hits 2298 2286 -12 - Misses 1392 1401 +9 ``` | [Flag](https://app.codecov.io/gh/tobac-project/tobac/pull/463/flags?src=pr&el=flags&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=tobac-project) | Coverage Δ | | |---|---|---| | [unittests](https://app.codecov.io/gh/tobac-project/tobac/pull/463/flags?src=pr&el=flag&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=tobac-project) | `62.00% <90.47%> (-0.28%)` | :arrow_down: | Flags with carried forward coverage won't be shown. [Click here](https://docs.codecov.io/docs/carryforward-flags?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=tobac-project#carryforward-flags-in-the-pull-request-comment) to find out more.

:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Have feedback on the report? Share it here.

[freemansw1]

I should have noted that this fixes the merge conflicts (and the resulting test failures) from #462.

[w-k-jones]

Thanks for sorting this! I realised after opening #462 that the merge was too complex to do online, so I have closed that now. I'll have a look through, as I noticed a number of non-conflicting instances where changes had been reverted by the merge in #462

[freemansw1]

We should hold off merging this until #465 is merged.