point t.py to local 4.0 softax
add __init__.py files for pypy module detection in v30
add flake8 dep for pep8 tox env
more tweaking (tox mostly works if site deps are current)
checkpoint this sandbox, to go home and dig through it there
add flake8 dep for pep8 tox env
more tweaking (tox mostly works if site deps are current)
checkpoint
update unittest2 imports
remove temp files
resolved conflict
remove temp file
bring in doug's new stuff