Merge pull request #2536 from endrift/deploy-mac Tools: Use non-CMake tool for fixing up OS X bundles
