Fixed travis/tox enviromnents, fixed tests (again), added badges