another round of editing, updated correlation matrix, etc.
resolved some conflicts

Merge branch 'master' of github.com:aswoboda/Noise-Hedonic

Conflicts:
	reports/Draft.Rnw
	reports/Draft.log
	reports/Draft.pdf
	reports/Draft.tex