Fixed PEP8 style errors using autopep8.
Moved comment above statement.
Merge branch 'master' into topic/pep8-style-fixes
Merge pull request #88 from thedrow/topic/pep8-style-fixes

Fixed PEP8 style errors using autopep8.