MAINT: clean up comments/commented-out code in distributions.py

Also some PEP8 fixes.

Shaves 200 useless lines off this way-too-long file.