Do you really have to think about the Web in discreet chunks to talk about the future? Besides if you really want to define "web 2.0" (which always maybes me shudder) its more about the average person contributing content; it's not about the technology that enabled it.