Support host within dbname argument of psql. Issue #35 only supported extracted clusterid from host argument. This needs to work for host provided within a dbname string (in psql argument) too.
