Began switchover of results.json to XML.
Merge branch 'master' into xml

Conflicts:
	parsetext.py
Moved the results file fully to XML.