Changed order of k,v in NSMAP dictionaries to play nicer with lxml. Aligned ns aliases across stix versions (probably missed a couple)