Use @options[:timeout] instead of wait
Merge pull request #24 from justinstoller/bug/master/QE311-undefined_wait

(QE-311) Bring just Scott's fix in (closes #20)