added gvimdiff as difftool
added and ordered plugins