Re-include variable definitions and prepare for last round

[coroa]

Changes to variabledefs are in the second commit: https://github.com/IAMconsortium/concordia/pull/59/commits/ab9b424223f2468f742e67304ad556adf3edb922

[gidden]

Thanks @coroa - I went through the csv and added all comments directly there