Fix canonical
Sitemap generator
Merge branch 'www-matthewcampbell-org' of github.com:matthew-campbell/octopress into www-matthewcampbell-org