Some changes to be compatible with rust master

 - Either was removed from master, so I replaced it here too
 - #[start] was removed from the demo.
I'm not sure that was it the best solution, but the "start_on_main_thread" function was removed from std::rt in the rust master.