I've just adapt wifly librarie for a little projet. I've followed the advices of arduino site. My project can build without error, but I don't tested it on a wifly board (I don't have one at this time).
I've replaced Client.h and Server.h by WiFlyClient.h and WiFlyServer.h. And replaced to the classes Client by WiFlyClient and Server by WiFlyServer.
You'll need to change the source of your project to include those new names !
I'm not sure that this will be finallised as "the WiFly librarie for Arduino 1.0", but I suppose it's a good start...
(right click - save as)
Tell me If this is running...