Fix issues with the merge.  Many pages were reverted back to their full HTML state instead of using Jekyll build syntax