Changes for Yosemite

Adding in changes so this runs under Mac OS X Yosemite.