Khartoum, east rebels ink deal to end revolt