Merge branch 'master' into lucid.co.nz
Merge branch 'master' into ashhilton
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
fix orderly clash on index with different grouped elements
fix slider caption widths; fixes #120
misc
Merge branch 'master' into ashhilton

Conflicts:
	dist/scss/styles.scss
	theme/assets/_base.css
carousel caption colour, media heading margin, navbar form size
unused css
zip
Merge pull request #159 from luciddesign/ashhilton

carousel caption colour, media heading margin, navbar form size
re - fix siler caption width
re delete styles.scss
navbar dropdowns font size and colour
orderly?
fix merge conflict
fix dropdwon text color
fixup slider caption colours