Updated the grid mixin so there's less nesting needed.
Updated grid and image-replacement mixin and merge conflict.