Letting travis work with new testr
Fixing tox and fixing tests for py26