Parametric signal model now allows for both cut based and for 2011 running when propagating single photon category uncertainties

Squashed commit of the following:

commit d008f8c5bb2e5f98993d35d94033f1f1df45e860
    Parametric signal model now allows for both cut based and for 2011 running when propagating single photon category uncertainties

commit 86de1385f7d5833b513872c885423ba04dd24e84
    Merge branch 'master' of github.com:h2gglobe/h2gglobe into photon_cat_systematics

commit dd627e940e6ca0fb0e7680a053b4cffd133bbcca
    Merge branch 'master' of github.com:h2gglobe/h2gglobe into photon_cat_systematics

commit a8effaf5b589931ac55d575cfed80dce797f20b0
    Changes to accomadate cut based analysis datacard making
Merge pull request #149 from matthewkenzie/photon_cat_systematics_forCBand7TeV

Parametric signal model with photon cat systematics now allows for both cut based and for 2011