Got HistogramManager.merge working

Hopefully the fact that it only generates 673 histograms instead of 700+
is because I've turned the eccentricity calculation off via
user_config.py.