Always remove cluster, even if errors thrown in teardown
Fixes #162. Correct python3 incompatibilities