New version based on wintersmith, with git-rebase article.