Move import of importlib to make Python 2.6 happy
Clean up and standardize ObjectType tests.
Oops. Remove print statement.
Allow adding to CybOX metadata after the fact.
fixed incorrect function call and changed variable names for correctness
Merge branch 'master' of github.com:CybOXProject/python-cybox
removed unused imports
Convert BaseProperties and ObjectProperties to TypedFields.
Merge branch 'master' into xs