Merge remote-tracking branch 'upstream/develop' into develop

README.md

@@ -139,7 +139,7 @@ You can then go on to use any normal postgresql commands against the container.
 Under ubuntu 14.04 the postgresql client can be installed like this:
 
 ```
-sudo apt-get install postgresql-client-9.3
+sudo apt-get install postgresql-client-9.5
 ```
 
 

build.sh

@@ -1 +1 @@
-docker build -t kartoza/postgis .
+docker build -t kartoza/postgis:9.5-2.2 .

postgres.conf

@@ -1,5 +0,0 @@
-[program:postgres]
-user=root
-command=/start-postgis.sh
-autorestart=true
-stopsignal=INT