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

composer.json

@@ -5,6 +5,5 @@
   , "homepage": "http://twitter.github.com/bootstrap/"
   , "author": "Twitter Inc."
   , "license": "Apache-2.0"
-  , "target-dir": "twitter/bootstrap"
 
 }