Remove line length pep8 problems (mostly).

This means we are now 100% pep8 compatible.

Fixes #691 (no outstanding errors or warnings).