added pypi version and download stats
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
setup.py migrated to setuptools
script to bootstrap setuptools added
Merge pull request #161 from glastopf/setup_tools

setup.py migrated to setuptools
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
setup takes care of this now
more travis cleanup
start Conpot with empty template during test

#162
trying to make sure we use virtualenv
Update .travis.yml
greenlets are done as soon as server has initialised
fixed observer pattern in databus
pretending reboot