Revert "Revert "Merge branch 'travis-support' of github.com:rlex/puppet-dnsmasq""

This reverts commit 96a28851870b00eeab1bad5718d83f289a58fca4.