Topic/setup

Finish updates to support both 10.9 and 10.10.