Some small changes to the conversion/import code
Merge branch 'shc_changes'

Conflicts:
	xml_to_json.py
Adding archive files to osf_json files
Some updates to the ct parser
Merge branch 'master' of github.com:pjfan/ClinicalTrialsParser

Conflicts:
	clinical_trials_parser.py
	ct_osf_json/NCT00000122_osf.json
	ct_osf_json/NCT00000160_osf.json
	ct_osf_json/NCT00000162_osf.json
	ct_osf_json/NCT00000193_osf.json
	ct_osf_json/NCT00000201_osf.json
	ct_osf_json/NCT02147249_osf.json
	ct_osf_json/NCT02147561_osf.json
	ct_osf_json/NCT02152930_osf.json
	ct_osf_json/NCT02155712_osf.json
	ct_osf_json/NCT02155933_osf.json
	importer/importer.py
	xml_to_json.py
I rewrote/organized some code to streaming importing
Merge branch 'master' of github.com:pjfan/ClinicalTrialsParser
Merge branch 'shc-latest'

Conflicts:
	clinical_trials_parser.py
	ct_osf_json/NCT00000122_osf.json
	ct_osf_json/NCT00000160_osf.json
	ct_osf_json/NCT00000162_osf.json
	ct_osf_json/NCT00000193_osf.json
	ct_osf_json/NCT00000201_osf.json
	ct_osf_json/NCT02147249_osf.json
	ct_osf_json/NCT02147561_osf.json
	ct_osf_json/NCT02152930_osf.json
	ct_osf_json/NCT02155712_osf.json
	ct_osf_json/NCT02155933_osf.json