Merge and clean up OSX set up scripts