[bigben2k]

Personally, I believe in this:
a relatively square tank, intake at the top, below the water line, outlet at the bottom, then a baffle just to make sure that the incoming water flows upwards, giving a chance for the air to come out, or otherwise climb up the baffle, and an opening between the outlet and the baffle, again, for a second pass at removing air.