Paper style plots

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)