cleaning up PSUL and making it easy to do the 20158 switch

I like to put imports in alphabetical order just to make them easier to read through (but this is not any kind of official Python practice). E.g. https://github.com/mariogiov/ngi_pipeline/blob/devel/ngi_pipeline/common/__init__.py#L11