Clean up pep8 and pylint violations

This cleans up pep8 and pylint violations on the feature branch. @wedaly, could you help me review this?
This comment is giving me trouble - pylint continues to flag it, despite the use of `disable`.