add the scala-mode load path
I have no idea.

Conflicts:
	common.el
Merge branch 'master' of https://github.com/rvclayton/.emacs.d
conditionally set the haskell-mode hook.