alias vimdiff, rename df to di, and update xml formatter