Create a merge between Noise and the Disco spec

[mimoo]

Right now one needs to read both the Noise and the Disco spec.

One could create a Self-contained Disco spec that would be much smaller than the Noise spec. I think this would be a good thing to facilitate implementation of Disco.