Ensure timeouts don't keep cli running.
Ensure timeouts don't keep cli running.

patrickkettner/smokestack,mattdesl/smokestack,mattdesl/smokestack,nowells/smokestack,kemitchell/smokestack,nowells/smokestack,nolanlawson/smokestack,nolanlawson/smokestack,patrickkettner/smokestack,kemitchell/smokestack