PEP8 + general tidy

Didn't think I had committed that change to .gitignore before, hence two commits.