Fix OS X 32 bit build error, and bring buildbot config in sync with default.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@56534 954f8c5b-7b00-dc11-b283-0030488c597c