One thing I missed in the previous pull request is the indentation. Please use four spaces as recommended in PEP8 and uses in the rest of the file.

After that you can try the description on https://help.github.com/articles/interactive-rebase to squash the commits on your branch and the PR will update automatically.