Upgrade bootstrap and fix incompatibility with 3.0.1.

Signed-off-by: Ben Corlett <bencorlett@me.com>