Upgrade to Bootstrap 3.3.1

And delete two versions of Bootstrap that aren't actually being referenced anywhere
Fix some unmatched divs