Update Sherlock Merlin

[adelavega]

Re-enable and update the Sherlock Merlin dataset.

• Fixes bug related to pybids > 0.8. layout.get_collections would return incorrect result because preproc and raw file interfered in variable loading.
• Ensure re ingesting does not cause conflict with old RunStimulus

[adelavega]

TODO:

• Catch up Sherlock Merlin on extracted variables
• fmriprep failed on confounds

[codecov-io]

Codecov Report

Merging #675 into master will increase coverage by 0.01%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           master     #675      +/-   ##
==========================================
+ Coverage   81.81%   81.83%   +0.01%     
==========================================
  Files          57       57              
  Lines        2233     2235       +2     
==========================================
+ Hits         1827     1829       +2     
  Misses        406      406

Impacted Files	Coverage Δ
neuroscout/populate/ingest.py	92.59% <100%> (+0.11%)	⬆️

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e60977f...9d766bd. Read the comment docs.