Added waitFor overload taking Matcher, which is convenient for waiting for hasContent and the like.