yet another attempt at auto-merging stuff into gh-pages.. maybe it was the orphaning that killed me.