Issue #43: Bring more files into pep8 compliance
Merge pull request #56 from jimmysong/43b

Issue #43: Bring more files into pep8 compliance