Make site data more generic

Conflicts:
	data/site.ymd
Simplify the way urls are generated in templates