break up long line
keep structure of dictionary consistent(!)
pass indicator data through
use completely different way of accessing templates
pass right data through
hack around absurd name clash
use mustache
add special block for dubious javascript files
use singular form of identifier
re-enable admin links
resurrect indicator types
titlise
factor out common id
hack indicator categories back in
remove commented code
hack the per-indicator admin links back in
Merge branch 'master' into tidy-templates
remove unused code and template
rm unused vars
start to plumb links through