Refactor, cleaning up mess around unique-ifying
Merge remote-tracking branch 'feodor/jsonb_and_hstore' into jsonb_and_hstore