setup.py fiddling
reorg
add tox.ini, doesn't do anything yet