Merge pull request #310 from lbl-srg/Annex60Sync

Annex60 sync
Reformatted code
Renamed models for Annex60 merge
Merged Annex branch issue39_idealHeaterCooler
Merged Annex60, branch issue39_idealHeaterCooler
Merged Annex60, issue39_idealHeaterCooler
Corrected medium
Updated reference results
Merged Annex60, ideal heater/cooler
Merged Annex60, branch issue39_idealHeaterCooler
Updated release notes and conversion script.