Plugin cleanup / Vundle scheme update