Split out propane and fuel oil in annual results

[asparke2]

Currently, ComStock reports propane and fuel oil no 2. combined into the single "other fuel" in the annual results. They are already reported separately in the timeseries data. Report them out separately in the annual data. Change the reporting measure, then also change the postprocessing and SightGlassDataProcessing to match.