Merge pull request #55 from elemoine/stacklight-matchers

Use better message matchers