Incorporated changes from master branch.

data/SSP1_tau.csv

data/SSP2_tau.csv

data/SSP3_tau.csv

data/SSP4_tau.csv

data/SSP5_tau.csv

data/Tau_diet_Storyline1.csv

data/Tau_diet_Storyline4.csv

data/bioenergy_gen1.csv

data/bioenergy_gen2_iiasa.csv

data/countries_excluded.csv

data/country_groups.csv

data/craftyCountries.csv

data/shockDistributions.csv

data/shockProbabilities.csv

data/ssp.csv

data/ssp_covid.csv

data/subsidyrates.csv

data/subsidyrates_UKdoubled.csv

data/tradeBarriers.csv

data/tradeBarriers_UKdoubled.csv