Firearms charge drop against Buju Banton in new deal