use newer pytest machinery
bump req + tox
Merge pull request #30 from davidszotten/fix26

Fix26