Revert "pep8 removed"

This reverts commit c45c23cf80aa437cbf5732172d185a5fa422c70e.
Revert "Merge remote-tracking branch 'zenoss/dox' into develop"

This reverts commit 6300deea25c17bfba431d84e187205d8e5eff080, reversing
changes made to 1c9d9485d31bc8161137f1ae84afb3526194da73.