Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Conflicts:
	docs/assets/css/bootstrap.css

docs/assets/css/bootstrap.css

@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Fri Jan 27 14:48:21 PST 2012
+ * Date: Fri Jan 27 14:48:53 PST 2012
  */
 article,
 aside,

docs/build/index.js

@@ -14,6 +14,8 @@ pages = fs.readdirSync(__dirname + '/../templates/pages')
 // iterate over pages
 pages.forEach(function (name) {
 
+  if (!name.match(/\.mustache$/)) return
+
   var page = fs.readFileSync(__dirname  + '/../templates/pages/' + name, 'utf-8')
     , context = {}