Set vimdiff as git mergetool
Add aliases for git svn rebase and dcommit