NBC: Man accused of holding woman captive in cinder block cell in Oregon is charged with rape in new case