Move hosts.erb, add puppet header, use clientcert instead of FQDN fact.
Update tests.