OK use tox
update test runners to be module-based
Merge remote-tracking branch 'upstream/master'
PEP8 style fixes