The ignore_resolvconf param has disappeared upstream
Ensure resolvconf is configured before configuring dnsmasq

This is the right order to do these things.
Revert "Ensure resolvconf is configured before configuring dnsmasq"

This reverts commit 5562042d485a8efbd18378bb1b03aa4ff33f08d2.

Actually, we want dnsmasq configured before we configure resolvconf,
because we then tell resolvconf to use 127.0.0.1 as a dns server.
Explicitly use dnsmasq::upstreams class

introduced in alphagov/puppet-dnsmasq@f79dac2c75
Fix travis build for use_dnsmasq_upstart_branch

note that .fixtures.yml will need to be adjusted back once the upstream
upstart branch is merged.
Expose dnsmasq's upstream_servers parameter
Upstream branch has been merged; update fixtures
Clean up test

This test passed, but only due to implementation details within the
dnsmasq module. Better to code to the interface instead.
Merge pull request #3 from alphagov/use_dnsmasq_upstart_branch

Use dnsmasq upstart branch