* Refactored CI * Added test-integration.txt for integration tests * Removed .tox from "make clean" * Fixed pypy * Cleanup * Added "--reruns 2" to integration tests