Updates for paper style plotting in makeCombinePlots.py and adding kglu-kgam plots.
Several updates for using externally produced 2D hists (eg from smoothed/interpolated scans)
Fixing merge issues.
New paper style
Merge branch 'nckw-updates-for-combine-tools' of https://github.com/nucleosynthesis/h2gglobe into nckw-updates-for-combine-tools
Merge pull request #414 from nucleosynthesis/nckw-updates-for-combine-tools

Paper style plots