Those nice folks in the ADFS team have release a policy builder to simplify the creation of Client Access Policies for Office 365 in AD FS 2.0 Rollup 1 onwards.

Available here:

http://gallery.technet.microsoft.com/scriptcenter/Client-Access-Policy-30be8ae2

Enjoy..