fixing tox testenv properties; adding tox file to manifest
Merge branch 'testsetup' into develop