Added scala-mode2
Merge branch 'master' of github.com:fgimenez/.emacs.d