Major cleanup;
Major cleanups

Make it compliant to newer pandoc2rfc and cleanups the XML to
make it work with xml2rfc v2