Added scala mode.
Merge branch 'master' of https://github.com/krasm/emacsrc