A couple of PEP 8 fixes

I got bored, waiting for all my packages to build, so I thought I'd do a bit of busywork. :smile:  

```
(develop)$ pep8 . | wc -l
2595
(pep8)$ pep8 . | wc -l
2355
```

Still a long way to go, but 240 down is not too bad.