Evolution of the galaxy stellar mass function: evidence for an increasing M* from z = 2 to the present day