bootstrap: copy recursive

We now have some directories we like to copy too.
bootstrap: Fix testing branch merging.