Populating more hostvars, including the hostname we already have

but still allowing tags and vars to take precedence.