Postgres Specific Updates

This corrects the table definition and associated sql Jen added for
naming assets a few months ago.

If the asset_names table already exists then the table will need to
be dropped and snorby:update will be required to recreate it.
Fix merge conflicts