Upgraded to Bootstrap 3.0.3, and fixed up layout issues stemming from that change
Reformatted