added waitFor feature and enhanced request matchers.  Also used ClientRequest for everything instead of HttpServletRequest