Upgrade requirements to pep8 1.4.3 and mccabe 0.2
Obsolete __future__ import
Review the content of the README
Typo in the sample output
Plugin pep8-naming is released
Typos in the changelog
And we're done merging the two branches

Thanks @flox!