wrong cast in lumiReweight
Merge branch 'master' of github.com:h2gglobe/h2gglobe
Merge branch 'master' of github.com:h2gglobe/h2gglobe

Conflicts:
	PhotonAnalysis/src/PhotonAnalysis.cc
Josh new boundaries for 7TeV mva dijet
Allow for summing of smearing nuisances in quadrature for parametric model.
Plus a couple of tweaks to combine plotting script.
Merge pull request #306 from amarini/Josh_newBound_7TeV

Josh new boundaries for 7 TeV mva  analysis
Merge pull request #307 from matthewkenzie/quadraticSumForSigmaNuisances

Allow for summing of smearing nuisances in quadrature