sitemap changes post core refactor
Merge pull request #655 from evancooper/sitemap_merge

sitemap changes post core refactor