bootstrap

This change is a follow up to the bootstrap discussion.


Any particular reason to not fold this into bootstrap.sh? Do you expect us to want to call it separately for some reason?