Added deleting functionality to vineyard and more flexibility in overriding vine selection.