Changes to upgrade twitter bootstrap, consolidate some CSS