Fix natural_key method for class Subtheme, correctly referencing theme.name
Add consistent subsets of countries and of socioeconomic data and set deploy.sh to load them