Merge branch 'hotfix-0.9.5.2'
commiting gos changes so far.
Merge branch 'master' of github.com:mikejw/empathy into gos_branch
using same db host config value for postgres.
small changes to JSONView plugin.
small fix.
small fix -again.
ignoring uppercase handling for URIs.
completing merge.
updating todo.