Merge pull request #80 from mor1/master

blog: xensummit 2013 not 2012; correct link to youtube video
whitespace
whitespace
whitespace
whitespace
[tmpl] fix formatting in dev-preview-checklist
[blog] start to rationalise permalinks via feed.id
[dispatch] rationalise blog vs wiki
Add a couple more links from Lars
Merge pull request #81 from avsm/master

Add a couple more links from Lars
[site] consistent use of `Cowabloga.Headers`
whitespace
[feeds] updates uses id now too
Merge branch 'master' of https://github.com/mirage/mirage-www