Adding _XSI_TYPE to is_plain() conditions
Merge remote-tracking branch 'origin/master'
Fixed AttributeErrors caused by not checking for None
Updated unit tests to align with new VocabString dict representation
Merge with origin/master