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/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