edited tox.ini and setup.py location
Changed setup.py location
Merge branch 'master' into jkinnard
Merge branch 'jkinnard'