Updated core files to account for new naming conventions
Updated core files to account for new naming conventions
Merge branch 'master' of github.com:CybOXProject/python-cybox
Updated address and driver objects
Merge branch 'master' of https://github.com/CybOXProject/python-cybox
Merge branch 'master' into simple_api

Conflicts:
	cybox/common/hash.py
	cybox/core/defined_object.py
	cybox/core/object.py
	cybox/core/observable.py
	cybox/core/observables.py
	cybox/core/stateful_measure.py
	cybox/objects/address_object.py