Merge branch 'master' into lucid.co.nz
Merge branch 'master' into lucid.co.nz
(Hopefully!) smarter column-balancing of thumbs
Merge branch 'master' into lucid.co.nz

Conflicts:
	theme/templates/product.liquid
	theme/templates/product.portfolio.liquid
Merge branch 'master' into lucid.co.nz

Conflicts:
	theme/snippets/__thumbnail-span.liquid
	theme/templates/product.liquid
	theme/templates/product.portfolio.liquid
Merge pull request #163 from luciddesign/lucid.co.nz

Lucid.co.nz