Demo settings and Layer name updates.
Demo settings and Layer name updates.

Some crufty changes but this changes the mapbook to be
mostly compliant with the new demo data.

geomoose/gm3,geomoose/gm3,geomoose/gm3