updated masonry version, reworked grid to use masonry step 1
Merge branch 'masonry-rewrite'