fix bug 902576 - Remove spaces from base template macros

No more landing page issues.  Stupid Django and its can-only-define-a-block-once philosophy.