update gh-pages to match master