Switching back to scala-mode as scala-mode2 isn't quite working at the moment