PEP8 Cleanup; mainly whitespace
Merge branch 'master' into defaultFactory