Merge branch 'master' into tidy-grid

* master:
  Add a mixin that ties a breakpoint to certain grid settings for accurate span-column()s

Conflicts:
	stylesheets/_config.sass
	stylesheets/modules/_example_module_b.sass
	stylesheets/modules/_grid.sass

stylesheets/modules/_grid.sass

@@ -1,7 +1,7 @@
 // This module is a top-level Susy grid container.
 //
-// You can use Susy methods like span-columns() and at-breakpoint() in modules that
-// are placed inside this container. 
+// You can use Susy's at-breakpoint() in modules that are placed inside this container.
+// To use Susy's grid mixins (eg span-columns), use at-breakpoint-with-grid-settings() instead.
 //
 // You'll eventually want to delete the +susy-grid-background lines.
 //