Revert "Fix doctest + misc. PEP8 and formatting fixes."
Merge pull request #3 from mcara/revert-2-mcara-fixes

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