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
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.
Merge pull request #206 from luciddesign/artbaygallery

Artbaygallery
agh zip
merge bs
Merge pull request #205 from gavinballard/grunt_shopify_theme_settings

Closes #186 - Use Grunt plugin to manage theme settings.
Merge branch 'master' of https://github.com/luciddesign/bootstrapify
update; rebuild; gurnts
zip
add body class for navbar collapse
add body class for navbar collapse