Six

Better Python 2.5 support and native Python 3 support; hopefully this will improve the results of the Travis tests.