adds scala sbtconfig
use sourcetree for git mergetool; set gitconfig name/email
better tmux-vim support