switiching to scala mode2. Also making sure that tabs don't start creeping into random places
Merge branch 'master' of github.com:fanatoly/my-emacs-stuff

Conflicts:
	packages.el

* java-mode-indent-annotations.el: Merge branch 'master' of github.com:fanatoly/my-emacs-stuff

Conflicts:
	packages.el