Fix CustomQuerySet to call super, cleanup PEP8

CustomQuerySet wasn't calling super() so all kinds of errors were popping up.

Also cleaned up to match PEP8.

Also removed old managers that were commented out.
Merge remote branch 'auzigog/patch-2' into develop