PEP 8 - @Zearin I'm looking at you
Merge branch 'master' of github.com:heynemann/preggy