run flake8, tidy code
run and tidy 2to3
tidy code
fix merge
add tox.ini