Issue30: implement nested locations

Cleans up region/destrict labeling confusion and also restores Wilmhurst locations to visibility.