Merge branch 'develop' of github.com:lscsoft/pcat into develop

Conflicts:
	GMM.py
	PCAT_configread.py
	TODO.txt
Merge branch 'develop'

Conflicts:
	PCAT_configread.py
	TODO.txt