Ensure all template blocks use underscores not dashes

For consistency innit
Use django-cache-panel in debug toolbar
Show template timings in debug toolbar