mostly support relative paths
support relative paths in the doc links, too
add _site/docs back to git (for easy deploys)
remove merge markup