Updated Olympic Circle

Got updated E and F by recording waypoints. Got other
updates from Nick who is responsible for placing the
marks.  F will be moved back into it's planned position
by him later this summer.
Regenerated