remove all local copies of bootstrap
make all js hotlink
add back js/css links using local versions
fixed merge conflicts