Fixed a bug in tox handling
Merge branch 'master' of ssh://pigsmath/home/lmatheson/bin