Updated to new vundle format