Patches for cic legacy plots
Avoid clash with discrete nuisance parameters across years
Had to merge back in with master

Merge branch 'master' of github.com:matthewkenzie/h2gglobe into cic_legacy_run

Conflicts:
	BackgroundProfileFitting/test/fTest.cpp
Merge pull request #256 from matthewkenzie/cic_legacy_run

Patches for cic legacy plots