Update Bootstrap to 3.2, markup to match