Add better detection for gestures on query strings
Fix detection of CALABASH_DEFAULT_TIMEOUT