Merge branch 'develop'

* develop:
  this is my whitespace push to develop
Merge branch 'develop'

* develop:
  converting shed master->develop
  removing link to hangout release form - https://app.asana.com/0/1177737814773/13439021301243
Merge branch 'develop'

* develop:
  reverting cache to just a lookup until I can figure why transient caching isn't working
Merge branch 'develop'

* develop:
  ripping our caching entirely
Merge branch 'develop'

* develop:
  reverting code.
Merge branch 'develop'

* develop:
  altering cache expiration to a lower value
Merge branch 'master' of https://github.com/Make-Magazine/makeblog

* 'master' of https://github.com/Make-Magazine/makeblog:
  Maker Shed banner ad on home page image
  Updated link for day of making site
  Updated Shed banner for Home Page
adding new url to shed feed carousel
Merge branch 'develop' of https://github.com/Make-Magazine/makeblog into develop

* 'develop' of https://github.com/Make-Magazine/makeblog:
  This changes the Shed product feed from the old Volusion function to the new Shopify function on only the category pages.
Merge branch 'develop' of https://github.com/Make-Magazine/makeblog into develop

* 'develop' of https://github.com/Make-Magazine/makeblog:
  Adding the new Shed Shopify product feed function in to almost all pages that used the old Volusion product feed.
Merge branch 'develop'

* develop:
  Adding the new Shed Shopify product feed function in to almost all pages that used the old Volusion product feed.
  This changes the Shed product feed from the old Volusion function to the new Shopify function on only the category pages.
  adding new url to shed feed carousel
Merge branch 'master' of https://github.com/Make-Magazine/makeblog

* 'master' of https://github.com/Make-Magazine/makeblog:
  Redirects for Volume 40
  Maker Shed ad for Projects
  Getting branch back in order
  New link and styles for maker camp projects promo
  New url for maker shed ad on projects page
  Revert "Shed ad to particular projects"
  Shed ad to particular projects
Merge branch 'develop' of https://github.com/Make-Magazine/makeblog into develop

* 'develop' of https://github.com/Make-Magazine/makeblog:
  Shed Ad for Maker Camp related Blog Post
  Maker Camp Shed Ads for Project Pages
  Redirects for Volume 40
  Maker Shed ad for Projects
  Getting branch back in order
  New link and styles for maker camp projects promo
  New url for maker shed ad on projects page
  Revert "Shed ad to particular projects"
  Shed ad to particular projects
adding error tags and reporting for in the maker shed
adding in some error checking
Merge branch 'develop'

* develop:
  adding in some error checking
  adding error tags and reporting for in the maker shed
  Shed Ad for Maker Camp related Blog Post
  Maker Camp Shed Ads for Project Pages