The new/revamped macbooks and ipods won't be covered in the promo deal, even if they do come out before the sept 15th cut-off. While the deal at the moment looks enticing, there are a few very good reasons to wait for the revamped macbooks and ipods.
The base line macbook is likely to be $1000, $100 lower than the current macbook and with the education discount, that could go as low as $900, but more likely $950.
In addition, the macbooks are expected to be upgraded to alum, be thinner, lighter, and incorporate multitouch in the trackpad. It's also rumored that a display may be placed under the trackpad. Other specs include a bigger HD, hopefully a DVD burner (they still got the combo drive)
The ipod prices are expected to be lowered, with usual spec increases. The nano is rumored to be getting a bigger display and being more narrow/zune like, if thats what you're interested in. multitouch is another possibility for the nano.
A general rule to note is that with macs, you're usually better off buying as soon as they update something, as you'll get the best value, since apple rarely drops prices.
Also, if you wait two or 3 weeks into the school year, you could potentially save as much, if not more by buying the updated macbook and ipod compared to the current macbook with free ipod deal, and you'll be getting better value for your $. I know going to the computer lab doesn't sound too great, but it's really not that bad and it'll prevent you from wasting time on things like facebook, etc.