Update setup.py and tox.ini to specify py.test for testing
Merge pull request #75 from gazpachoking/pytest

Update setup.py and tox.ini to specify py.test for testing