New version of the shapefile data

This reflects improvements to the csv data source