Minor wording changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	design.tex
	introduction.tex
Additional minor wording changes; finished review pass.