Improvements to bootstrap.sh. Closes GH-8.