Merge site changes into gh-pages