Tour de France winner Alberto Contador has signed a two-year deal to race with Team Saxo Bank from next season.