Normalize travis testing

Updates travis to use recent versions of puppet.