Added include_matching matcher, moved matcher specs

- current spec status: 371 examples, 0 failures