pep8
fixed bugs, includes are still to come
merge
minor fixes and readded some includes
fixed includes
added runner includes
merge
Merge pull request #38 from steinwurf/pep8

pep8