Changed around some vim plugins