Updated Bootstrap from Master

Downloaded zip files from Gulch2- Master, hoping this new branch
doesn't screw anything up..
Updating bootstrap?