travis
Merge branch 'rebase_fun' of github.com:ghoneycutt/puppet-dnsclient into rebase_fun
revert template attempt