add stuff for scala
Merge remote-tracking branch 'origin/master'

Conflicts:
	vim/vimrc.symlink
	zsh/aliases.zsh