Fully qualify spatial and replication properties
Merge 1.9 changes into Head
Changes to map layout and skins according to input from Callie and Matt