Merge branch 'master' into develop

* master:
  roll back population indicator
  Fix a comma in one of the descriptions (#47)
  Fixed typos in Readme
  make a release version

# Conflicts:
#	ddf--concepts.csv

README.md

@@ -5,16 +5,16 @@ The name is inspired by [Systema Naturae](https://en.wikipedia.org/wiki/Systema_
 This is the main dataset used in tools on the official Gapminder website. It contains local & global statistics combined from hundreds of sources.
 
 ## How to update
-Currently the dataset is maintained by manually copyig data from multiple other datasets.
+Currently the dataset is maintained by manually copying data from multiple other datasets.
 The plan is to automate the process by using a file called ddf--imports.csv
 Described [here](https://github.com/open-numbers/Data-Description-Format-DDF/wiki/File:-ddf-imports)
 
-##Deppendencies
-If you added more dataset dependencies add them manualy to the excel file in data_process, and save as csv to the dataset folder. All GS-dependencies must be of type ddf and public as an Open Numbers github repo.
+##Dependencies
+If you added more dataset dependencies, add them manually to the excel file in data_process, and save as csv to the dataset folder. All GS-dependencies must be of type ddf and public as an Open Numbers github repo.
 Files:
-* ddf--dependencies is manually edites
+* ddf--dependencies is manually edited
 
 ## License
-Gapmidner created this dataset and provides it under [Creative Common Attribution 4.0 International][CC].
+Gapminder created this dataset and provides it under [Creative Common Attribution 4.0 International][CC].
 
 [CC]: https://creativecommons.org/licenses/by/4.0/

ddf--concepts.csv

@@ -20,7 +20,7 @@ math_achievement_8th_grade,"Math achievement, 8th grade",measure,,http://spreads
 ratio_of_girls_to_boys_in_primary_and_secondary_education_perc,Ratio girls/boys in school,measure,,http://spreadsheets.google.com/pub?key=pyj6tScZqmEcWM3hb0x-BZA,,"[""linear"", ""log""]",,"primary and secondary education, gross ratio",,Gender parity index for gross enrollment ratio in primary and secondary education is the ratio of girls to boys enrolled at primary and secondary levels in public and private schools.,gender_equality
 ratio_of_young_literate_females_to_males_percent_ages_15_24,Ratio of young literate females to males,measure,,https://docs.google.com/spreadsheet/pub?key=0AkBd6lyS3EmpdE8xR0dUWDI4ME02SjQ5bi1NYnFHN0E,,"[""linear"", ""log""]",,"%, ages 15-24",,"Ratio of young literate females to males is the percentage of females to males ages 15-24 who can, with understanding, read and write a short, simple statement on their everyday life.",gender_equality
 literacy_rate_adult_female_percent_of_females_ages_15_above,Literacy of adult females,measure,,http://spreadsheets.google.com/pub?key=pyj6tScZqmEc96gAEE60-Zg,,"[""linear"", ""log""]",,"%, ages 15+",,"Adult literacy rate is the percentage of people ages 15 and above who can, with understanding, read and write a short, simple statement on their everyday life.",literacy
-co2_intensity_of_economic_output_kg_co2_per_2011_ppp_of_gdp,CO2 intensity of economic output,measure,,https://docs.google.com/spreadsheet/pub?key=0AkBd6lyS3EmpdEVUcEJVRzlFWWRRcjhveGlrQzdwdUE,,"[""linear"", ""log""]",,kg CO2 per 2011 PPP $ of GDP,,"Carbon dioxide emissions are those stemming from the burning of fossil fuels and the manufacture of cement. They include carbon dioxide produced during consumption of solid, liquid, and gas fuels and gas flaring.",emissions
+co2_intensity_of_economic_output_kg_co2_per_2011_ppp_of_gdp,CO2 intensity of economic output,measure,,https://docs.google.com/spreadsheet/pub?key=0AkBd6lyS3EmpdEVUcEJVRzlFWWRRcjhveGlrQzdwdUE,,"[""linear"", ""log""]",,kg CO2 per 2011 PPP $ of GDP,,Measures the amount of CO2 (kg) emitted for every dollar of GDP produced (constant purchasing power parity-adjusted 2011).,emissions
 cumulative_co2_emissions_tonnes,Cumulative CO2 emissions,measure,,https://github.com/open-numbers/ddf--gapminder--co2_emission,,"[""log"", ""linear""]",,metric tons,,Total CO2 emissions from fossil fuel for the period between 1751 and the relevant year in metric tonnes.,emissions
 sulfur_emissions_per_person_kg,Sulfur emissions per person,measure,,http://spreadsheets.google.com/pub?key=phAwcNAVuyj0uBndTxZAXNQ,,"[""log"", ""linear""]",,kg,,Sulfur emissions per person. Associated with acid rain. (Kilograms of sulfur per person and year).,emissions
 total_sulfur_emission_kilotonnes,Sulfur emission,measure,,http://spreadsheets.google.com/pub?key=t9SYWh7siLJDzyZYN1R4HfQ,,"[""log"", ""linear""]",,kilotons,,Total sulfur emissions per year. Associated with acid rain. 1000 tonnes of sulfur per year.,emissions
@@ -170,13 +170,12 @@ co2_emissions_tonnes_per_person,CO2 per capita,measure,,https://github.com/open-
 child_mortality_0_5_year_olds_dying_per_1000_born,Child mortality rate,measure,,http://spreadsheets.google.com/pub?key=0ArfEDsV3bBwCcGhBd2NOQVZ1eWowNVpSNjl1c3lRSWc,,"[""log"", ""linear""]",,deaths under age 5 per 1000 births,,"Death of children under five years of age per 1,000 live births","_root, newborn_infants"
 gapminder_gini,Gapminder gini,measure,,https://github.com/open-numbers/ddf--gapminder--gini,,"[""linear""]",,,,,_none
 life_expectancy_years,Life expectancy,measure,,https://github.com/open-numbers/ddf--gapminder--life_expectancy,,"[""linear"", ""log""]",,years,,The average number of years a newborn child would live if current mortality patterns were to stay the same.,"_root, health"
-extreme_poverty_percent_people_below_190_a_day,Extreme poverty,measure,,http://spreadsheets.google.com/pub?key=t1YAVXUoD3iJKy2mSq2Padw,,"[""linear"", ""log""]",,% people below $1.90 a day,,"Poverty headcount ratio at $1.90 a day is the percentage of the population living on less than $1.90 a day at 2011 international prices. As a result of revisions in PPP exchange rates, poverty rates for individual countries cannot be compared with poverty rates reported in earlier editions.",poverty_inequality
-poverty_percent_people_below_310_a_day,Poverty,measure,,http://spreadsheets.google.com/pub?key=tBrbR3BlR_12WlTIlSTpu6g,,"[""linear"", ""log""]",,% people below $3.10 a day,,"Poverty headcount ratio at $3.10 a day is the percentage of the population living on less than $3.10 a day at 2011 international prices. As a result of revisions in PPP exchange rates, poverty rates for individual countries cannot be compared with poverty rates reported in earlier editions.",poverty_inequality
+extreme_poverty_percent_people_below_190_a_day,Extreme poverty,measure,,http://spreadsheets.google.com/pub?key=t1YAVXUoD3iJKy2mSq2Padw,,"[""linear"", ""log""]",,% people below $1.90 a day,,The percentage of people living on less than $1.90 (2011 purchasing power parity dollars).,poverty_inequality
 gnipercapita_atlasmethod_current_us,GNI/capita (Atlas method),measure,,https://docs.google.com/spreadsheet/pub?key=0ArfEDsV3bBwCdFVrVDZQUnRwZ2lqT2lPMXcySXZwRmc,,"[""log"", ""linear""]",,$,,"GNI per capita (formerly GNP per capita) is the gross national income, converted to U.S. dollars using the World Bank Atlas method, divided by the midyear population. GNI is the sum of value added by all resident producers plus any product taxes (less subsidies) not included in the valuation of output plus net receipts of primary income (compensation of employees and property income) from abroad. GNI, calculated in national currency, is usually converted to U.S. dollars at official exchange rates for comparisons across economies, although an alternative rate is used when the official exchange rate is judged to diverge by an exceptionally large margin from the rate actually applied in international transactions. To smooth fluctuations in prices and exchange rates, a special Atlas method of conversion is used by the World Bank. This applies a conversion factor that averages the exchange rate for a given year and the two preceding years, adjusted for differences in rates of inflation between the country, and through 2000, the G-5 countries (France, Germany, Japan, the United Kingdom, and the United States). From 2001, these countries include the Euro area, Japan, the United Kingdom, and the United States.",incomes_growth
 gnipercapita_ppp_current_international,GNI/capita PPP,measure,,https://docs.google.com/spreadsheet/pub?key=0ArfEDsV3bBwCdGhJcHAwanc2aFdZeXl1WTVZQnJjb1E,,"[""log"", ""linear""]",,$,,GNI per capita based on purchasing power parity (PPP). PPP GNI is gross national income (GNI) converted to international dollars using purchasing power parity rates. An international dollar has the same purchasing power over GNI as a U.S. dollar has in the United States. GNI is the sum of value added by all resident producers plus any product taxes (less subsidies) not included in the valuation of output plus net receipts of primary income (compensation of employees and property income) from abroad. Data are in current international dollars based on the 2011 ICP round.,incomes_growth
 inequality_index_gini,Gini coefficient,measure,,http://spreadsheets.google.com/pub?key=pyj6tScZqmEcjeKHnZq6RIg,,"[""linear"", ""log""]",,,,"Gini index measures the extent to which the distribution of income (or, in some cases, consumption expenditure) among individuals or households within an economy deviates from a perfectly equal distribution. A Lorenz curve plots the cumulative percentages of total income received against the cumulative number of recipients, starting with the poorest individual or household. The Gini index measures the area between the Lorenz curve and a hypothetical line of absolute equality, expressed as a percentage of the maximum area under the line. Thus a Gini index of 0 represents perfect equality, while an index of 100 implies perfect inequality.",poverty_inequality
 income_share_of_richest_10percent,Income of richest 10%,measure,,http://spreadsheets.google.com/pub?key=tmKvydPl_roGIQBrMYA6C4g,,"[""linear"", ""log""]",,share,,Percentage share of income or consumption is the share that accrues to subgroups of population indicated by deciles or quintiles.,poverty_inequality
-gnipercapita_constant_2010_us,GNI/capita,measure,,https://docs.google.com/spreadsheet/pub?key=0ArfEDsV3bBwCdFdqZ0NOdjluMmoyUTBTWTRjWWQzQVE,,"[""log"", ""linear""]",,$,,GNI per capita is gross national income divided by midyear population. GNI (formerly GNP) is the sum of value added by all resident producers plus any product taxes (less subsidies) not included in the valuation of output plus net receipts of primary income (compensation of employees and property income) from abroad. Data are in constant 2010 U.S. dollars.,incomes_growth
+gnipercapita_constant_2010_us,GNI/capita,measure,,https://docs.google.com/spreadsheet/pub?key=0ArfEDsV3bBwCdFdqZ0NOdjluMmoyUTBTWTRjWWQzQVE,,"[""log"", ""linear""]",,$,,GNI per capita (constant 2010 US$),incomes_growth
 aid_given_2007_us,Aid given,measure,,http://spreadsheets.google.com/pub?key=tFOn62dEO9QCyIKK6kgSYRQ,,"[""linear"", ""log""]",,$,,"Total amount of allocable aid for official development assistance (ODA) given by the donor countries, expressed in constant 2007 US$.",aid_given
 aid_given_per_person_2007_us,Aid given per person,measure,,http://spreadsheets.google.com/pub?key=tGTst0WEm8V8zI9LOYvGmTg,,"[""linear"", ""log""]",,$,,Total amount of official development assistance (ODA) aid that has been given during this year divided by the population of the country (2007 US$),aid_given
 aid_given_percent_of_gni,"Aid given, % of GNI",measure,,http://spreadsheets.google.com/pub?key=tQR7RhlZdPjBkVCDPPF4zUg,,"[""linear"", ""log""]",,,,Percentage of the gross national income (GNI) of each recepient country that has been given as official development assistance (ODA) aid during this year.,aid_given
@@ -189,7 +188,7 @@ health_aid_given_percent_of_aid,Health aid given,measure,,http://spreadsheets.go
 population_policies_aid_given_percent_of_aid,Population policies aid given,measure,,http://spreadsheets.google.com/pub?key=tjFf_YqwB6tgSG9L0r0Ywdg,,"[""linear"", ""log""]",,% of aid,,Percentage of total allocable aid for official development assistance (ODA) given by the donor countries that has been used in population policies/programs and reproductive health.,aid_given
 government_and_society_aid_given_percent_of_aid,Government and society aid given,measure,,http://spreadsheets.google.com/pub?key=t3IAEOsfHK-z6rvGLCDR74g,,"[""linear"", ""log""]",,% of aid,,Percentage of total allocable aid for official development assistance (ODA) given by the donor countries that has been used in government and civil societies.,aid_given
 other_social_services_aid_given_percent_of_aid,Other social services aid given,measure,,http://spreadsheets.google.com/pub?key=tqjUijP4mi_dHKkCZjOn0oA,,"[""linear"", ""log""]",,% of aid,,Percentage of total allocable aid for official development assistance (ODA) given by the donor countries that has been used in other social infrastructures and services.,aid_given
-aid_received_total_us_inflation_adjusted,Aid received,measure,,https://docs.google.com/spreadsheet/pub?key=0AkBd6lyS3EmpdHVuNVpKdnNCa08yV3NOd0Zsal9JaWc,,"[""linear"", ""log""]",,$,,"Net official development assistance (ODA) consists of disbursements of loans made on concessional terms (net of repayments of principal) and grants by official agencies of the members of the Development Assistance Committee (DAC), by multilateral institutions, and by non-DAC countries to promote economic development and welfare in countries and territories in the DAC list of ODA recipients. It includes loans with a grant element of at least 25 percent (calculated at a rate of discount of 10 percent). Data are in constant 2012 U.S. dollars.",aid_received
+aid_received_total_us_inflation_adjusted,Aid received,measure,,https://docs.google.com/spreadsheet/pub?key=0AkBd6lyS3EmpdHVuNVpKdnNCa08yV3NOd0Zsal9JaWc,,"[""linear"", ""log""]",,$,,"Net official development assistance (ODA) consists of disbursements of loans made on concessional terms (net of repayments of principal) and grants by official agencies of the members of the Development Assistance Committee (DAC), by multilateral institutions, and by non-DAC countries to promote economic development and welfare in countries and territories in the DAC list of ODA recipients. It includes loans with a grant element of at least 25 percent (calculated at a rate of discount of 10 percent). Data are in constant 2013 U.S. dollars.",aid_received
 aid_received_per_person_current_us,Aid received per person,measure,,http://spreadsheets.google.com/pub?key=t9GL1nIZdtxszJbjKErN2Hg,,"[""log"", ""linear""]",,$,,"Net official development assistance (ODA) per capita consists of disbursements of loans made on concessional terms (net of repayments of principal) and grants by official agencies of the members of the Development Assistance Committee (DAC), by multilateral institutions, and by non-DAC countries to promote economic development and welfare in countries and territories in the DAC list of ODA recipients; and is calculated by dividing net ODA received by the midyear population estimate. It includes loans with a grant element of at least 25 percent (calculated at a rate of discount of 10 percent).",aid_received
 aid_received_percent_of_gni,"Aid received, % of GNI",measure,,http://spreadsheets.google.com/pub?key=tzK6dx2JltRfVXFI1ADh84w,,"[""linear"", ""log""]",,,,"Net official development assistance (ODA) consists of disbursements of loans made on concessional terms (net of repayments of principal) and grants by official agencies of the members of the Development Assistance Committee (DAC), by multilateral institutions, and by non-DAC countries to promote economic development and welfare in countries and territories in the DAC list of ODA recipients. It includes loans with a grant element of at least 25 percent (calculated at a rate of discount of 10 percent).",aid_received
 dollar_billionaires_per_million_people,Dollar billionaires per million,measure,,http://spreadsheets.google.com/pub?key=tAQpQeQkuyA1-ZovdDJ7JAw,,"[""log"", ""linear""]",,,,"Number of billionaires among every 1 million people in the country of their citizenship, calculation based on data from Forbes.com",poverty_inequality
@@ -582,6 +581,7 @@ arb4,arb4,string,,,,,,,,,_none
 arb5,arb5,string,,,,,,,,,_none
 arb6,arb6,string,,,,,,,,,_none
 domain,Domain,string,,,,,,,,,_none
+poverty_percent_people_below_310_a_day,Poverty,measure,,http://spreadsheets.google.com/pub?key=tBrbR3BlR_12WlTIlSTpu6g,,"[""linear"", ""log""]",,% people below $3.10 a day,,The percentage of people living on less than $3.10 (2011 purchasing power parity dollars).,poverty_inequality
 rank,Ranking order,measure,,,,,,,,,_none
 rural_poverty_percent_rural_people_below_national_rural,Rural poverty,measure,,http://spreadsheets.google.com/pub?key=trbzCrl1eb6QJG5D8j1-qQw,,"[""linear"", ""log""]",,%,,Rural poverty headcount ratio is the percentage of the rural population living below the national poverty lines.,poverty_inequality
 urban_poverty_percent_urban_people_below_national_urban,Urban poverty,measure,,http://spreadsheets.google.com/pub?key=tublssyj-uqIY25OoRupbCw,,"[""linear"", ""log""]",,%,,Urban poverty headcount ratio is the percentage of the urban population living below the national poverty lines.,poverty_inequality