this blog now runs on git :(
Merge branch 'master' into gh_projects