Build environment updates

This pull contains commits to fix the OS X build and allow GitMake test to pass.
Quite the opposite; ./GitMake test was broken for me everywhere until I removed these lines. I just did a full 'make test' and 'GitMake test' on FreeBSD 9.1 to make certain that it works.