Swapped out some plugins for Vim