Merge branch 'master' of http://git.local.twitter.com/bootstrap

lib/forms.less

@@ -218,7 +218,7 @@ div.input-append {
     display: block;
     width: auto;
     min-width: 16px;
-    padding: 5px 4px 5px 5px;
+    padding: 4px 4px 4px 5px;
     color: @grayLight;
     font-weight: normal;
     line-height: 18px;

lib/scaffolding.less

@@ -78,6 +78,7 @@ a {
 // Buttons
 .btn {
   .button();
+  .transition(.1s linear all);
   &.primary {
     #gradient > .vertical(@blue, @blueDark);
     color: #fff;
@@ -102,6 +103,13 @@ a {
     .opacity(65);
     cursor: default;
   }
+  &:focus {
+    
+  }
+  &:active {
+    @shadow: inset 0 3px 7px rgba(0,0,0,.1), 0 1px 2px rgba(0,0,0,.05);
+    .box-shadow(@shadow);
+  }
 }
 // Help Firefox not be a douche about adding extra padding to buttons
 button.btn,