Copy existing dir before overlaying [#64]

This also uses a newer overlay that doesn't require unzip, fixing #69