heavy edits to 4.0-4.2
Merge branch 'master' of github.com:nfeltman/RenderGen

Conflicts:
	paper/splitting.tex