pulling in some changes from bootstrap 2.3.0