Get the puppet-git module back on trunk

They've fixed the issues upstream, so we don't need to use my fork any more.