Change the database type properly to postgis on windows
Merge branch 'master' into exspatialite
NMTK Username instead ofusername, since on Windows the USERNAME env is set by default