Making sure hstore types are merged during update

rather than overwritten.  This is mostly so that syncs from external
sources such as joyent don't clobber any custom tags or vars set
directly through the tory API.