Use vimdiff for git mergetool
Add alias mtpsync for android