[tox]
envlist = py27, py34

[testenv]
deps = -r{toxinidir}/test-requirements.txt
commands = py.test test

[tox]
envlist = py27, py34

[testenv]
deps=-rtest-requirements.txt
commands=py.test test

Revert "Re-retry to fix travis settings"
Revert "Re-retry to fix travis settings"

This reverts commit 0c8757518ef3a7a49d23f7e43475e46ef2b7a5ff.
