Merge branch 'master' into ashhilton
Merge branch 'master' into meadowcroft
replace thumbnail images for hompage blog excerpts
style updates
Merge branch 'master' into meadowcroft - Updates from Stewart

Conflicts:
	theme/assets/_base.css
allow setting to hide tag snippet
setting to show/hide product sorter
apply theme setting styles to #navbar-main
clean up banner and slider body padding
increase media-heading top margin
setting to hide tags on blog
remove collection specific tag array

allow tag loop to work on blog
Merge pull request #153 from luciddesign/meadowcroft

Tag fixes, show/hide product sorter, apply theme setting styles to main navbar
Merge branch 'master' of github.com:luciddesign/bootstrapify
fix error if hompage collection is not set
always set bg-color; fixes #155
always set bg-color; fixes #155
instagram feed now uses thumbnail span; fixes #116
delete unused _base.css file
Merge branch 'master' into meadowcroft