Fixed flake8 complaints.
Merge pull request #107 from petteraas/lint_fixes

Fixed flake8 complaints.