Populating more hostvars, including the hostname we already have

but still allowing tags and vars to take precedence.
Merge pull request #34 from modcloth/use-the-hostname-we-already-have

Populating more hostvars, including the hostname we already have