Merge branch 'master' into blackenbrook
change collection grid class to extend col class
zip
carousel speed setting
Merge branch 'master' into blackenbrook

Conflicts:
	Bootstrapify.zip
Pull in Bootstrapify changes
capture secondary collection image
grunt
grunt
add secondary collection image with hover
fix hover when diff ratios
Add `grunt-shopify-theme-settings` plugin and generate first pass at theme settings.
Bump required version of grunt plugin to access `default` feature.
Break settings.yml out into individually ordered YAML files.
Few tweaks to bring new settings in line with old ones.
Bump required version of Grunt plugin to enable empty <option> tags in settings.
Pick up new settings from master, fix rebase merge issue.
opt in to secondary images on products
grunt
Merge pull request #206 from luciddesign/artbaygallery

Artbaygallery