fixed init.sh
added vimdiff as git mergetool