Make site data more generic
Simplify the way urls are generated in templates

Conflicts:
	data/site.ymd