I am planning on buying a Macbook, most likely black, for school next year. I am in no rush to buy it until September. Is there any hope of upgrades at WWDC or new iPods to buy with the college Mac + iPod discount that should cause me to wait? If the chances of any upgrades are slim, I'll probably just buy it now. Any thoughts???