Merge pull request #2 from tomster/master

simple test fixture
Removed pytest.ini, fixed tox.ini and a Python 3 failure.