Use the git skeleton file. Fix some small things it found.

But the rebasing proved difficult, so instead branch from the master
branch and checkout just the changed files.

And CI.