git and puppet minor changes