More touch-ups
Merge branch 'master' into soda-submission

Conflicts:
	todolist.tex