Glasgow and Scotland prop Jon Welsh has signed a new two-year deal which keeps him at Scotstoun until May 2015.