PEP8 stylification.
More PEP8 stylification.
Merge pull request #11 from StevenLooman/master

Big commit from StevenLooman: "Following PEP8 style guide". Has some other small changes too