pep8
Import order fixes
Indentation
Cleaned up html indentation
Merge pull request #6 from lizardsystem/reinout-cleanup

Generic cleanup and indentation and pep8 and pyflakes