Simplify shutdown logic for Connection
Simplify the Travis config