Updated for Yosemite installation from scratch