Renewed support for 8 TeV data and MC, added re-clustering on the fly.