Structural models for the interaction of oxygen with Al(111) and Al implied by photoemission and surface EXAFS