some Travis updates
some more tests
inheritance changes
one more puppet test