Bs3update

Here's the bootstrap 3 update.  Several commits negate each other.  Sorry about that :\