adding a few vim plugins
fixing conflicts