getting ready for merge to gh-pages