more Mac OS fixes
switch to scala-mode2