emacs: let the package manager manage scala-mode.  Note: locally you will want to a) make sure you have the latest git (1.8.3+), b) do
'git submodule deinit emacs.d/scala-mode'.