Haiti: Aristide returns, two killed in "calm" vote