I would also like us to consider merging the STIX and TAXII media types.

We talked about this at the F2F and the consensus is that we need to do this. There are still questions about what to do with having a single media type for both STIX and TAXII or keep two. Jason, myself, and others think that a single media type is probably the better choice, if we can address the version parameter. The version parameter aspect that we need to deal with, is that STIX versions will probably rev much faster than TAXII.

Done in WD01