Separate out features that are in both old and new versions.

Add table of feature class mappings to OSM.
Use newer OSM extract
Wrapper scripts for new version