Bump git to 1.8.4

Also including some updates from the original homebrew formula.