Hamas, Fatah reach agreement over make-up of unity gov't