merge bootstrap changes from branch patch-1

for some reason git was giving me a hard time when I tried to actually
do this through git, instead of manually copying and pasting
also includes some other misc changes