Use dictsort in templates. OrderedDict not available in py26
Remove old fix