Adds scala-mode2 to the mix.
Merge branch 'master' of github.com:dodecaphonic/emacs
Actually adds scala-mode2 now yo.