Fixed scala support
Merge branch 'master' of github.com:fourier/txm-emacs-scripts
Merge branch 'master' of github.com:fourier/txm-emacs-scripts
Merge branch 'master' of github.com:fourier/txm-emacs-scripts