It looks good to me. I'd be OK to merge, but the Travis build is
failing (AFAICT because flake8 no longer supports Python 2.6).
@PyPA - are we OK to merge this with the Python 2.6 build failing? I
don't have time right now to fix that (it's only removing 2.6 from the
travis config, unless we actually want to continue requiring 2.6 to
work...)
Paul