Re-enable git-salt behind a flag.

TBR @rginda