Outer structure of the Galactic warp and flare: explaining the Canis Major over-density (cid:1)