Clean-up old countrify function
Clean-up old countrify function

Take it back to what it used to be before I started overloading features
onto it.

ricardog/raster-project,ricardog/raster-project,ricardog/raster-project,ricardog/raster-project,ricardog/raster-project