updated single display templates and promo display template to allow for blank overrides
Merge branch 'master' of github-dnl:convio/Feeding-America-2014-Redesign