Standardize handling for #wait_for_ready options :timeout and :delay

Otherwise if you set one, you have to set the other too