Update headers and isort imports
More fixes for previously overzealous changes to setup.py