Battle for the 'Taco Tuesday' trademark is over as Taco John's ends dispute with Taco Bell