Not so much what is in my EDC, but how I carry -- I recently picked up a leather messenger bag with a main internal compartment 11" wide, 9.5 deep and 2-3" wide.  This is the first bag I've had in a while that isn't nylon with a backpack form-factor.  
A zippered pocket inside the main compartment will accommodate a tablet.  My intent is to not stuff it and instead only carry what I actually need daily.  I'll probably have a small FAK and a small tool kit, but otherwise stuff I use daily.  It has a dedicated front pocket that's large enough for a large cell phone.  Stuffing it would easily add up to more weight than would be comfortable.  I'll experiment with how to carry water and how much.