improve  template loader see https://docs.djangoproject.com/en/1.2/ref/templates/api/#loader-types
Merge branch 'master' of https://github.com/est/FrameworkBenchmarks into est-master
Missing commas