Do not mix true proton and deuteron spectra so they can be compared to unfolding results even after "hadd".
Merge branch 'master' of github.com:gaponenko/Clark
Revert Makefile to use RooUnfold and others from the common TWIST areas.