Post fix ups
Fix for jekyll 2.2
Fix build errors