merges in some new vim plugins