Move some optional classes and <hr> styles into the scaffolding module

frameworks/blueprint/stylesheets/blueprint/modules/_grid.sass

@@ -138,14 +138,3 @@
     @for !n from 1 to !layout_grid_columns + 1
       .push-#{!n}
         +push(!n)
-    //*** The following classes are provided for convenience. You can comment them out if you don't want them. ***//
-    // Border on right hand side of a column. You can comment this out if you don't plan to use it.
-    div.border
-      +border
-    // Border with more whitespace, spans one column.
-    div.colborder
-      +colborder
-    hr
-      +colruler
-    hr.space
-      +colspacer

frameworks/blueprint/stylesheets/blueprint/modules/_scaffolding.sass

@@ -1,3 +1,4 @@
+@import grid
 /*
   The styles contained here are meant to provide for an attractive experience out of the box
   and are meant to be removed once custom visual design begins.
@@ -16,3 +17,13 @@
     +body-margins
     .box
       +box
+    // Border on right hand side of a column. You can comment this out if you don't plan to use it.
+    div.border
+      +border
+    // Border with more whitespace, spans one column.
+    div.colborder
+      +colborder
+    hr
+      +colruler
+    hr.space
+      +colspacer