Make p4merge available in $PATH on OS X
Use a system-specific Git configuration