Fix shifting of group when detecting collisions

And tests/fixtures /cc @aismail
Merge branch 'grid-columns' of https://github.com/uberVU/grid into grid-columns