Commenting out the SetBranchStatus lines by default, as they seem to cause segfaults depending on what's read.
Changing for macosx64 from g++ to clang++ -- likely need to look at the command line options as well.  Only takes effect for macos...