Improve the bootstrapper

This also fixes the following error (when I was running `./bootstrap.sh` on ZSH):
```
./bootstrap.sh: 11: ./bootstrap.sh: pushd: not found
```