Generalised Geometries for Type II and M Theory