Build environment updates

This pull contains commits to fix the OS X build and allow GitMake test to pass.
I did a 'GitMake -j 12' followed by a 'GitMake test' before writing.

Just now, I checked out a clean branch based on the upstream master. First, I did a 'GitMake -j 20' followed by 'GitMake test'. The 'GitMake test' step broke.

Then I ran 'GitMake -j 20' test. It also broke.

Back in my branch containing these changes, 'GitMake -j 20' passed. This is all on FreeBSD 9.1.