Teddi Mellencamp and Lisa Vanderpump Have Finally Ended 'Puppygate' Feud