[FIX] Collision between Multi-T1w and --no-freesurfer
[FIX] Collision between Multi-T1w and --no-freesurfer

Fixes #879

oesteban/fmriprep,poldracklab/fmriprep,oesteban/preprocessing-workflow,oesteban/fmriprep,oesteban/preprocessing-workflow,oesteban/fmriprep,poldracklab/fmriprep,poldracklab/preprocessing-workflow,poldracklab/fmriprep,poldracklab/preprocessing-workflow