Ensure headers from base.html are included.
Merge pull request #1115 from torrance/headers_fix

Ensure headers from base.html are included.