added some support for scala development
Merge branch 'master' of https://github.com/robdoherty2/.emacs.d