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 line is also giving me a hard time - pylint continues to mark `kwargs` as unused despite the use of `unused-argument`.