Loading files
still adding
Lots of updates... this is probably the first real push
test commit.
indicator, hot fixes on marking and parameters
marking, commenting out until Jason takes care of the issues.  He seemed to have a better understanding of the issues with TLP color and marking.
jason says we need cStringIO.  Checking it in.
handling needs to work
Bug fixes and support for indicator.idref and indicator.composite_indicator_expression objects.
Merge branch 'master' of https://github.com/security-automation/secauto-stix

Conflicts:
	stix/indicator/indicator.py
conflict resolution
Here you go, Dave
Merge branch 'master' of https://github.com/security-automation/secauto-stix
jason typo
adding children
hopefully this should solve kill chain dupes
hot fix encoding issue and more XML out work
isolating our version of export
jason bug squash day!
Merge update
Merge branch 'master' of https://github.com/security-automation/secauto-stix