Update .travis.yml
Use pytest rather than tox for Travis-CI
Merge pull request #7 from hfaran/dev

Use pytest rather than tox for Travis-CI compatibility