Add sitemap generator plugin
Copy year bump
Merge with upstream