Musk said during the press conference today that they're targeting thruster landings (in any atmosphere!) within 3 years, or more like 4-5 if they encounter difficulties.