reorg all the git cruft a bit, highlight setup page and de-highlight more