Minor modifications
Support for shuffling together matching task stimuli so they don't repeat
Combining stimuli for matching task