"The diet used to prevent disease is the same one used to treat it." -Whole30
Mark Sisson also has some good tips for tasty beverages that you can read on his blog at Mark's Daily Apple. Also, the Whole9 website posted something today about drink options on a Whole30. Read about it here.