DOC: finally (?) fix gh-pages make target
DOC: merge Makefile