merged in my pending changes from 1.2-wip branch, resolve diffs as best as i could, update docs and alerts to use original classes, updated docs to include smaller section for layouts

lib/patterns.less

@@ -374,7 +374,7 @@ input[type=submit].btn {
 // ------------
 
 // Base alert styles
-.alert {
+.alert-message {
   .gradientBar(#fceec1, #eedc94); // warning by default
   margin-bottom: @baseline;
   padding: 7px 14px;
@@ -416,8 +416,7 @@ input[type=submit].btn {
     }
   }
 
-  &.alert-block,
-  &.alert-block:hover {
+  &.block-message {
     background-image: none;
     background-color: lighten(#fceec1, 5%);
     padding: 14px;

lib/preboot.less

@@ -192,8 +192,7 @@
 // Shared colors for buttons and alerts
 
 .btn,
-.alert {
-
+.alert-message {
   &.danger,
   &.danger:hover,
   &.error,
@@ -217,7 +216,6 @@
   &.info {
     .gradientBar(#6bd0ee, #36b3d9);
   }
-
 }
 
 // Gradients