Merge pull request #473 from Visgean/master

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

Django.gitignore

@@ -1,4 +0,0 @@
-*.log
-*.pot
-*.pyc
-local_settings.py

Python.gitignore

@@ -37,3 +37,8 @@ coverage.xml
 .mr.developer.cfg
 .project
 .pydevproject
+
+
+-# Django stuff:
+ -*.log
+ -*.pot