Revert "Trying a fix for MakerShed products feed. We are losing the feed on a lot of pages, and I think the cache is being trampled. So, to prevent it not showing up for longer period of time, we are going to lower the cache time to one minute."

This reverts commit 178ebd710b351d465ae29f4d3d965d4b95fd8c7a.
Merge branch 'master' into develop

Conflicts:
	includes/theme_stuff.php