[tox]
envlist = py27, py33, py34, py35, py36

[testenv]
deps= -rrequirements.txt
	mock
	nose
commands=nosetests

[tox]
envlist = py27, py33, py34, py35, py36

[testenv]
deps= -rrequirements.txt
commands=pytest

Update Tox to use pytest
Update Tox to use pytest

to make it consistent with Travis. requirements.txt includes mock and pytest.
