Reorganize data and locale files to allow for overlay data sets.
Use the new overlay data sets to fix Taiwan and Puerto Rico. Fixes #120 and #124.