fixed issue where object.type_ was being set incorrectly
Merge branch 'master' of github.com:CybOXProject/python-cybox