Merge branch 'pep8ify' of https://github.com/habi/matplotlib into pep8ify
Revert "Fixed PEP8 coding style violations of "tools""

This reverts commit 7497d1a9e46961935cabb2cd92a49652a52ab179.