Created new branch for mac configuration.  It slightly differs when using xquarts