stix and cybox added
contact_domain added to taxii config and contact_name set to conpot as default
STIX transform test re-enabled.
contact_name now valid.
STIX transform now using the python-stix module to generate the report.
Merge branch 'master' into new_stix

Conflicts:
	requirements.txt
Guarantee that the port mapping works for any template.
Cleaner imports
Merge pull request #160 from glastopf/new_stix

New STIX transform based on python-stix