Added tox, last 2.6 fix