Update tox to use py.test directly
Debug commit, implement pubsub.shutdown, more refactoring coming up shortly