Visiting Ethiopia

Have any of you visited Ethiopia in recent years for a vacation? I am interested in going, and would likely prefer an organized tour focusing on nature/ wildlife / rural environments. Any recommendations for good tour organizers, places to go, places to avoid (other than those mentioned in the State Department travel advisories), etc?