Mathematical modelling of solid tumour growth: from avascular to vascular, via angiogenesis