Bringing in more sensible stuff from cgarvis for jekyll version support.