Incorporate puppet models fixes in git.sh

No point in just telling people to do it and not doing it ourselves