Extend the pytest setup command to accept some of our required pytest options.

 * Use python setup.py test for tox testing as it exists the test
   process properly (should fix hanging travis tests)