added more helpful vim plugins
resolved conflict