Add .vim, bin, and use meld as git diff.