rejig generate_substring()
Merge branch 'master' of https://github.com/nathanhaigh/adelaide_swc_cge

Conflicts:
	generate_substring.py