Fixed for new flymake version and added scala-mode