Merge site.pp and nodes.pp

To fix the deprecation message warning that `import` is deprecated in
newer versions of Puppet:

    The use of 'import' is deprecated at /Users/matt/govuk/ci-puppet/manifests/site.pp:3. See http://links.puppetlabs.com/puppet-import-deprecation
Upgrade Puppet in Gemfile to version 3.7

Upgrade Puppet and Facter to match the versions supplied by the Vagrant
box templates we're using.

I'm specifying the exact versions so that we can use the exact same
versions as used by the Vagrant boxes.

I have tested this under Vagrant on the `ci-master`, `ci-slave-1`,
`ci-slave-2`, `ci-slave-4` and `transition-logs-1` machine types.
Merge pull request #252 from alphagov/82935274-upgrade_puppet_in_gemfile

[#82935274] Upgrade Puppet in Gemfile to version 3.7