moving gh-pages material into master