bootstrap: use bash over sh
Merge master into mac