Merge remote-tracking branch 'troggle/master'

.hgignore

@@ -1,16 +0,0 @@
-# use glob syntax
-syntax: glob
-
-*.pyc
-db*
-localsettings.py
-*~
-parsing_log.txt
-troggle
-troggle_log.txt
-.idea/*
-*.orig
-media/images/*
-.vscode/*
-.swp
-imagekit-off/

localsettingsdocker.py

@@ -1,5 +1,5 @@
 import sys
-# link localsettings to this file for use on expo computer in austria
+# This is the local settings for use with the docker compose dev setup. It is imported automatically
 
 DATABASES = {
     'default': {