Fix mate_wait on Yosemite
Ignore xccheckouts
Promised + Yosemite safe