Merge pull request #473 from Visgean/master

Merge the django template into the python one since there is a significant overlap