Added border-box to the grid mixin, rather than on the * element.
Merge branch 'dev'