Couple small updates to mirror relevant changes in generator-jekyllrb.