Change around vim plugins a bit