Update Travis harness to use current Puppet versions
Merge pull request #10 from ghoneycutt/cleanup_mathias_commits

Update Travis harness to use current Puppet versions