Fix script/bootstrap branch history.

Does all the things detailed in #111 without the bizarro post-party whack history.