More resilient regexes.

[dwt]

This helps prevent step definitions eating steps that have a suffix and really should point to a step that isn't yet there. (As frequently happens with 'within x seconds' steps)

[bbangert]

Thanks! Looks good.