CMS core functioning nearly done

- sitemap should work (but only to main nav, not to subnav)
- edit is still buggy... will fix shortly.
-
uh oh

merge conflicts... sigh