Merge branch 'master' into blackenbrook
grunt
Merge branch 'master' into blackenbrook

Conflicts:
Bootstrapify.zip
rebuild
rebuild
Improvements to collection template

Collection header (description and image) can now be configured to
display above or below the products.

Refactor collection—intro section to use semantic css markup so it can
be overridden through SASS in the theme settings (i.e., using
make-##-column() mixing).
Remove adaptive thumbnails setting
add cart count badge if its not shown yet
minor class adjustment
update footer credits
looking into signupform
zip
custom links and images meta
uniform thumbnails
newsletter signup form mail chimp updates
sidebar nav functionality tweaks
Merge branch 'master' into blackenbrook

Conflicts:
	Bootstrapify.zip
Merge pull request #200 from luciddesign/blackenbrook

mailchimp newsletter signup form tweaks and sidebar nav functionality stweaks
newsletter signup form js
and mailchimp-y-ness to ajax newsleter form