Merge pull request #291 from austb/update_travis_tests
(maint) travis: update testing to puppet 5 and 6