STY: pep8 and related fixes
Merge pull request #53 from dengemann/pep8_fixes

STY: pep8 and related fixes