corrected remaining pep8 violations
Merge remote-tracking branch 'upstream/master'
Merge pull request #42 from stevendgonzales/master

should fix remaining pep8 violations