Linear and non-linear evolution of the vertical shear instability in accretion discs