Add option to wait for clean test shutdown

Travis does not like the script killing itself
Travis config