Clean up pep8 and pylint violations

This cleans up pep8 and pylint violations on the feature branch. @wedaly, could you help me review this?
I wasn't able to get pylint to ignore this TODO unless I moved the comment up and used `W0511` instead of `fixme`.