Added gas and SA ely price to scenario choice variable, added internal GAMS calculation of ely SRMC
Corrected fuel subsidies
Added further financial reporting
Added new data transfer xls sheet, ran scenarios for 2012