Tmp/puppet 4

See if travis picks it up