Gateone manifests
Merge pull request #357 from dmi-try/up-777

Gateone manifests
nailgun settings fix
Merge pull request #359 from enchantner/puppet-template-fix

Nailgun settings fix