Use vimdiff as diff tool, add phptidy plugin