Merge pull request #189 from jdufresne/tox

Use the recommended test command in tox.ini