Change name, email. Add vimdiff to config