minor changes
Merge branch 'master' of https://github.com/dfink/systematics
G2 cloud discussion minor changes
Merge branch 'master' of https://github.com/dfink/systematics

Conflicts:
	whitepaper/whitepaper.bib
	whitepaper/whitepaper.tex