Minor tweaks before updating to jekyll 1.0