Rebase onto master after hack.  Documentation imminent.