Fixed probs with country loading logic. Updated demography to work with last version of the library.