Bump bootstrap and fix funkyness

Spenser Shumaker <sshumake@redhat.com>