Work in progress
Merge remote-tracking branch 'origin/python' into python

Conflicts:
	python/preprocess/preprocess.py
Rewrite read_files as generator for memory efficiency.