Improved instance mappings

Adding new up-to-date instance mapping files and a script to generate
them.  Not removing any of the old files since they are still in use.