Bishop City Council modifies ordinance but allows cultivation of medical marijuana