standardize options handling for :timeout and :delay ... otherwise if you set one, you have to set the other too
Merge branch 'fix-timeout-and-delay-defaulting' into phido