NBC: After years of rivalry, Uber puts NYC taxi cabs on its app