Updating for Yosemite and non-universal mac builds