Allow hostvars to have priority over group vars

Fixes issue described: https://github.com/ansible/ansible/pull/6666#issuecomment-38597209

Inventory runner already asks for host vars fromt he parser, this just keeps track of them and returns them.