@DP Kabuto probably probably did put some special tag or jutsu on Madara and Kabuto did say that he would undo the edo-tensai. Wouldn't that be a crappy way for Madara to die? I think that Madara should at least defeat 1/2 kages before he is gone for good.
The war is practically over seeing as though Tobi's tailed beasts who were resurrected from edo-tensei have been 'put to rest' by Kabuto and Kyuubi and Naruto are getting along. I doubt that the series will be over until Sasuke and Naruto have a conversation which lasts longer than 2 shows in a row. :]