Apologies about this, all Pep8 changes already exist in master.  I will take this commit out after getting to the end of the first review.