Added id and idref properties to main constructs. Added sanity checks to from_obj() on campaign, incident. This was made on the wrong branch, so I'll be merging over to master
Merge branch 'indicator_alt_id'
Updated tests to align with id/idref conventions
Fixed bug in STIXPackage.to_dict() where idref wasn't being printed