Fixed PEP8 version at 1.5.0 and fixed the errors it gives
Merge pull request #234 from amcinnes/fix-pep8

Fixed PEP8 version at 1.5.0 and fixed the errors it gives