consolidating gh-pages branch