removed commented out line
improved shutdown handling for travis CI