Another pass at compiling python on mac os
Merge conflict