Update scala mode and ensime
Merge branch 'master' of github.com:mjwall/dotfiles