Fix new py26 incompatibilities.

Run tox in travis from now on.