@mixing span-columns can now collapse margins

Passing "collapse" as the $display argument removes the right margin and
extends the width of the element to fill the adjacent gutter.