Finish off Python 2.6 support

This gets travis to test Python 2.6 and pass (hopefully.)