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
Update Readme to reflect recent changes. Close #157
Missed a 1
add compress to grunt; closes #141
update Readme; make grunt compress on watch
update Readme; make grunt compress on watch
refactor stick footer
fix issues with broken full width containers; fixes #154
update setting name
fix up missing closing section tag on collection
rebuild
fix missing main navbar style settings
fix footer padding if footer navbar is fixed
fix orderly clash on index with different grouped elements
fix slider caption widths; fixes #120
misc