South Sudan's Riek Machar to return to government as Vice President