Begin converting unfolding code to use channel separation
Merge remote-tracking branch 'origin/master'
Resolve merge conflict
Basic split-channel 1D unfolding, and it compiles too