Merge branch 'tox_support' of github.com:SandyWalsh/stacktach into tox_support