Revert "Fix doctest + misc. PEP8 and formatting fixes."

Reverts mcara/astropy#2. Doctests are failing.