fixes #1, now we can do ALL configuration in hiera and leave the puppet manifests alone.  also, use new custom facter fact about the machine being vagrant or not to determine if we should use the vagrant hiera file (vs using weird ::fqdn fact)