REALLY -- this is the primary commit.

Everything we need for Campaign 4. This is version R-16 with the map
changes. Script is still borked.