add git to base-pkgs
fix users pillar