Re-running black and isort with new isort parameter

Mark and I found a scenario where black and isort would fight over the correct formatting.

In our investigation, we also found that some files do not appear to have been formatted or had their imports sorted. This does that as well.