Renaming m1demo to m2demo. It is the M2 demo after all

I'll merge this once I've verified I haven't overlooked any other changes.