Add vim-scala and nerdtree.
Merge branch 'master' of https://github.com/ehiggs/dotfiles

Conflicts:
	.gitmodules