Travis no longer supports Python 2.5

Now I'm EVEN MORE glad my default dev venv is 2.5 based...
Merge branch '1.5' into 1.6