Revamped British foreign office puts focus on famine after aid merger