Collection matchers removals

This is #1003 redone to target master and to remove all the collection matchers code now that it's in the other gem.

/cc @JonRowe