Heavily rework
More refactoring
Merge branch 'master' of github.com:bgamari/fcs-sim

Conflicts:
	FcsCorr.hs