Yup, drink more water, limit sodium, and add lemon (a natural diuretic), as has already been suggested. Also, get in some cardio exercise daily (brisk walking is great) to help improve circulation, and try to add some extra potassium to your diet (bananas and raisins are good for this).
Those are all the suggestions I have, but note that sometimes even those things won't help much. Depending on the cause of the water retention, sometimes you just need to wait it out. I understand the frustration, as I've been right there with you over the past 2 weeks.
