Unified gh-pages and master