add scala
Merge branch 'master' of github.com:kou-m/.emacs.d