Upgrade to Bootstrap v3.1.1

I just merged in the changed from Bootstrap and resolved all of the conflicts. I haven't actually checked anything for "correctness" yet, since I'm not sure how we want to handle that.