Merge pull request #87 from DrMarcII/matcher

Change Clock.waitFor to support both unittest-based and matcher-based matchers.