pep8. diff looks to large - you didn't use tabs instead of 4 spaces, did you?
Merge pull request #1 from amueller/pep8

pep8.