Well I just got some of the jerry cans that Flight-ER-Doc linked. They were only $10 at walmart for a 7 gallon can. It sure is easier than filling up 2-liter bottles (which I still do).

I also got two water filter straws. I'm not sure how good they work but I got some anyway since they were cheap and lightweight.

"Remember that your adversary's desire to live is usually more powerful than whatever ammunition your are carrying in your firearms. Plan accordingly." -tire iron