Bug-fixes with html5lib version-conflict and PG configuration
Merge branch 'postgis'