Tweak Scala setup
Split OSX specific functionality out