Re-format to conform to pep8 standard

See http://www.python.org/dev/peps/pep-0008/

Signed-off-by: Emil Sit <sit@hadapt.com>
--
I have a few other changes in the pipeline, will send PRs for them shortly but this creates a nice base that is consistent with Python standards.