fixed verbose
removed most config options
Merge remote branch 'riley/master'

Conflicts:
	main.py
Made correlation a float