Update to include GUID gen on layers.

Layers now have GUID. Also fixed bug where
GUIDs were getting regenerated on reload of map.