More py25 cleanup
Added 3.4 to tox.ini