Apple's put out a New iCloud FAQ enumerating what will be in the new iCloud vs mobile me services and what won't. Short answer is almost everything that you want, and iDisk and iWeb won't be, but not many people will care about those (IMHO).